i965: Remove copy and pasted gen7_wm_constants state atom.

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

diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index 21e08ed5f36c15f6ae2c1c9f1065963ce809825f..aedee3d1c71e18e6699ae70070b428c56da79bda 100644 (file)
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -43,6 +43,7 @@ MAIN_SOURCES = \
        main/ffvertex_prog.c \
        main/fog.c \
        main/formats.c \
+       main/format_unpack.c \
        main/framebuffer.c \
        main/get.c \
        main/getstring.c \
@@ -71,6 +72,7 @@ MAIN_SOURCES = \
        main/readpix.c \
        main/remap.c \
        main/renderbuffer.c \
+       main/samplerobj.c \
        main/scissor.c \
        main/shaderapi.c \
        main/shaderobj.c \
@@ -83,7 +85,6 @@ MAIN_SOURCES = \
        main/texcompress_s3tc.c \
        main/texcompress_fxt1.c \
        main/texenv.c \
-       main/texfetch.c \
        main/texformat.c \
        main/texgen.c \
        main/texgetimage.c \
@@ -91,9 +92,9 @@ MAIN_SOURCES = \
        main/texobj.c \
        main/texpal.c \
        main/texparam.c \
-       main/texrender.c \
        main/texstate.c \
        main/texstore.c \
+       main/texturebarrier.c \
        main/transformfeedback.c \
        main/uniforms.c \
        main/varray.c \
@@ -103,7 +104,9 @@ MAIN_SOURCES = \
        $(MAIN_ES_SOURCES)
 
 MAIN_CXX_SOURCES = \
-       main/ff_fragment_shader.cpp
+       main/ff_fragment_shader.cpp \
+       main/shader_query.cpp \
+       main/uniform_query.cpp
 
 MATH_SOURCES = \
        math/m_debug_clip.c \
@@ -142,7 +145,10 @@ SWRAST_SOURCES = \
        swrast/s_span.c \
        swrast/s_stencil.c \
        swrast/s_texcombine.c \
+       swrast/s_texfetch.c \
        swrast/s_texfilter.c \
+       swrast/s_texrender.c \
+       swrast/s_texture.c \
        swrast/s_triangle.c \
        swrast/s_zoom.c
 
@@ -220,6 +226,7 @@ STATETRACKER_SOURCES = \
        state_tracker/st_cb_syncobj.c \
        state_tracker/st_cb_strings.c \
        state_tracker/st_cb_texture.c \
+       state_tracker/st_cb_texturebarrier.c \
        state_tracker/st_cb_viewport.c \
        state_tracker/st_cb_xformfb.c \
        state_tracker/st_context.c \
@@ -248,6 +255,7 @@ PROGRAM_SOURCES = \
        program/prog_instruction.c \
        program/prog_noise.c \
        program/prog_optimize.c \
+       program/prog_opt_constant_fold.c \
        program/prog_parameter.c \
        program/prog_parameter_layout.c \
        program/prog_print.c \
@@ -260,7 +268,8 @@ PROGRAM_SOURCES = \
 
 SHADER_CXX_SOURCES = \
        program/ir_to_mesa.cpp \
-       program/sampler.cpp
+       program/sampler.cpp \
+       program/string_to_uint_map.cpp
 
 ASM_C_SOURCES =        \
        x86/common_x86.c \
@@ -332,13 +341,13 @@ MESA_GALLIUM_SOURCES = \
        x86/common_x86.c
 
 MESA_GALLIUM_CXX_SOURCES = \
-       $(MAIN_CXX_SOURCES) \
-       $(SHADER_CXX_SOURCES)
+       $(MESA_CXX_SOURCES) \
+       state_tracker/st_glsl_to_tgsi.cpp
 
 # All the core C sources, for dependency checking
 ALL_SOURCES = \
        $(MESA_SOURCES)         \
-       $(MESA_CXX_SOURCES)     \
+       $(MESA_GALLIUM_CXX_SOURCES) \
        $(MESA_ASM_SOURCES)     \
        $(STATETRACKER_SOURCES)