gallium: pass the current context to the flush_front state tracker function

[mesa.git] / src / mesa / sources.mak

diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index be7e13d87f67d2e583379e29c22c6c2a651645cc..86aa31dac179178c7664631012804b87e166db4b 100644 (file)
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -5,12 +5,11 @@
 
 # this is part of MAIN_FILES
 MAIN_ES_FILES = \
-       $(BUILDDIR)main/api_exec_es1.c \
-       $(BUILDDIR)main/api_exec_es2.c
+       $(SRCDIR)main/es1_conversion.c
 
 MAIN_FILES = \
        $(SRCDIR)main/api_arrayelt.c \
-       $(SRCDIR)main/api_exec.c \
+       $(BUILDDIR)main/api_exec.c \
        $(SRCDIR)main/api_loopback.c \
        $(SRCDIR)main/api_validate.c \
        $(SRCDIR)main/accum.c \
@@ -31,7 +30,6 @@ MAIN_FILES = \
        $(SRCDIR)main/debug.c \
        $(SRCDIR)main/depth.c \
        $(SRCDIR)main/dlist.c \
-       $(SRCDIR)main/dlopen.c \
        $(SRCDIR)main/drawpix.c \
        $(SRCDIR)main/drawtex.c \
        $(SRCDIR)main/enable.c \
@@ -42,6 +40,7 @@ MAIN_FILES = \
        $(SRCDIR)main/fbobject.c \
        $(SRCDIR)main/feedback.c \
        $(SRCDIR)main/ffvertex_prog.c \
+       $(SRCDIR)main/ff_fragment_shader.cpp \
        $(SRCDIR)main/fog.c \
        $(SRCDIR)main/formats.c \
        $(SRCDIR)main/format_pack.c \
@@ -51,6 +50,7 @@ MAIN_FILES = \
        $(SRCDIR)main/getstring.c \
        $(SRCDIR)main/glformats.c \
        $(SRCDIR)main/hash.c \
+       $(SRCDIR)main/hash_table.c \
        $(SRCDIR)main/hint.c \
        $(SRCDIR)main/histogram.c \
        $(SRCDIR)main/image.c \
@@ -61,7 +61,6 @@ MAIN_FILES = \
        $(SRCDIR)main/mipmap.c \
        $(SRCDIR)main/mm.c \
        $(SRCDIR)main/multisample.c \
-       $(SRCDIR)main/nvprogram.c \
        $(SRCDIR)main/pack.c \
        $(SRCDIR)main/pbo.c \
        $(SRCDIR)main/pixel.c \
@@ -77,13 +76,16 @@ MAIN_FILES = \
        $(SRCDIR)main/renderbuffer.c \
        $(SRCDIR)main/samplerobj.c \
        $(SRCDIR)main/scissor.c \
+       $(SRCDIR)main/set.c \
        $(SRCDIR)main/shaderapi.c \
        $(SRCDIR)main/shaderobj.c \
+       $(SRCDIR)main/shader_query.cpp \
        $(SRCDIR)main/shared.c \
        $(SRCDIR)main/state.c \
        $(SRCDIR)main/stencil.c \
        $(SRCDIR)main/syncobj.c \
        $(SRCDIR)main/texcompress.c \
+       $(SRCDIR)main/texcompress_cpal.c \
        $(SRCDIR)main/texcompress_rgtc.c \
        $(SRCDIR)main/texcompress_s3tc.c \
        $(SRCDIR)main/texcompress_fxt1.c \
@@ -94,7 +96,6 @@ MAIN_FILES = \
        $(SRCDIR)main/texgetimage.c \
        $(SRCDIR)main/teximage.c \
        $(SRCDIR)main/texobj.c \
-       $(SRCDIR)main/texpal.c \
        $(SRCDIR)main/texparam.c \
        $(SRCDIR)main/texstate.c \
        $(SRCDIR)main/texstorage.c \
@@ -102,6 +103,7 @@ MAIN_FILES = \
        $(SRCDIR)main/texturebarrier.c \
        $(SRCDIR)main/transformfeedback.c \
        $(SRCDIR)main/uniforms.c \
+       $(SRCDIR)main/uniform_query.cpp \
        $(SRCDIR)main/varray.c \
        $(SRCDIR)main/version.c \
        $(SRCDIR)main/viewport.c \
@@ -109,11 +111,6 @@ MAIN_FILES = \
        $(BUILDDIR)main/enums.c \
        $(MAIN_ES_FILES)
 
-MAIN_CXX_FILES = \
-       $(SRCDIR)main/ff_fragment_shader.cpp \
-       $(SRCDIR)main/shader_query.cpp \
-       $(SRCDIR)main/uniform_query.cpp
-
 MATH_FILES = \
        $(SRCDIR)math/m_debug_clip.c \
        $(SRCDIR)math/m_debug_norm.c \
@@ -243,6 +240,7 @@ STATETRACKER_FILES = \
        $(SRCDIR)state_tracker/st_extensions.c \
        $(SRCDIR)state_tracker/st_format.c \
        $(SRCDIR)state_tracker/st_gen_mipmap.c \
+       $(SRCDIR)state_tracker/st_glsl_to_tgsi.cpp \
        $(SRCDIR)state_tracker/st_manager.c \
        $(SRCDIR)state_tracker/st_mesa_to_tgsi.c \
        $(SRCDIR)state_tracker/st_program.c \
@@ -251,8 +249,7 @@ STATETRACKER_FILES = \
 PROGRAM_FILES = \
        $(SRCDIR)program/arbprogparse.c \
        $(SRCDIR)program/hash_table.c \
-       $(SRCDIR)program/nvfragparse.c \
-       $(SRCDIR)program/nvvertparse.c \
+       $(SRCDIR)program/ir_to_mesa.cpp \
        $(SRCDIR)program/program.c \
        $(SRCDIR)program/program_parse_extra.c \
        $(SRCDIR)program/prog_cache.c \
@@ -267,16 +264,12 @@ PROGRAM_FILES = \
        $(SRCDIR)program/prog_statevars.c \
        $(SRCDIR)program/programopt.c \
        $(SRCDIR)program/register_allocate.c \
+       $(SRCDIR)program/sampler.cpp \
+       $(SRCDIR)program/string_to_uint_map.cpp \
        $(SRCDIR)program/symbol_table.c \
        $(BUILDDIR)program/lex.yy.c \
        $(BUILDDIR)program/program_parse.tab.c
 
-
-SHADER_CXX_FILES = \
-       $(SRCDIR)program/ir_to_mesa.cpp \
-       $(SRCDIR)program/sampler.cpp \
-       $(SRCDIR)program/string_to_uint_map.cpp
-
 ASM_C_FILES =  \
        $(SRCDIR)x86/common_x86.c \
        $(SRCDIR)x86/x86_xform.c \
@@ -325,59 +318,32 @@ MESA_FILES = \
        $(MATH_XFORM_FILES)     \
        $(VBO_FILES)            \
        $(TNL_FILES)            \
-       $(PROGRAM_FILES)        \
        $(SWRAST_FILES) \
        $(SWRAST_SETUP_FILES)   \
        $(COMMON_DRIVER_FILES)\
        $(ASM_C_FILES)
 
-MESA_CXX_FILES = \
-       $(MAIN_CXX_FILES) \
-       $(SHADER_CXX_FILES)
-
 # Sources for building Gallium drivers
 MESA_GALLIUM_FILES = \
        $(MAIN_FILES)           \
        $(MATH_FILES)           \
        $(VBO_FILES)            \
        $(STATETRACKER_FILES)   \
-       $(PROGRAM_FILES)        \
        $(SRCDIR)x86/common_x86.c
 
-MESA_GALLIUM_CXX_FILES = \
-       $(MESA_CXX_FILES) \
-       $(SRCDIR)state_tracker/st_glsl_to_tgsi.cpp
-
 # All the core C sources, for dependency checking
 ALL_FILES = \
        $(MESA_FILES)           \
-       $(MESA_GALLIUM_CXX_FILES) \
        $(MESA_ASM_FILES)       \
        $(STATETRACKER_FILES)
 
-
-### Object files
-
-MESA_OBJECTS = \
-       $(MESA_FILES:.c=.o) \
-       $(MESA_CXX_FILES:.cpp=.o) \
-       $(MESA_ASM_FILES:.S=.o)
-
-MESA_GALLIUM_OBJECTS = \
-       $(MESA_GALLIUM_FILES:.c=.o) \
-       $(MESA_GALLIUM_CXX_FILES:.cpp=.o) \
-       $(MESA_ASM_FILES:.S=.o)
-
-
-COMMON_DRIVER_OBJECTS = $(COMMON_DRIVER_FILES:.c=.o)
-
-
 ### Include directories
 
 INCLUDE_DIRS = \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/src/glsl \
        -I$(top_builddir)/src/glsl \
+       -I$(top_srcdir)/src/glsl/glcpp \
        -I$(top_srcdir)/src/mesa \
        -I$(top_builddir)/src/mesa \
        -I$(top_srcdir)/src/mesa/main \