swrast: Add implementation of MapTextureImage/UnmapTextureImage.

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

diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index 373f1b50d0592b54e725c32920e94b1fb46bfff1..deff7bd7850d212c509861363a60efea327b2c53 100644 (file)
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -58,8 +58,11 @@ MAIN_SOURCES = \
        main/mm.c \
        main/multisample.c \
        main/nvprogram.c \
+       main/pack.c \
+       main/pbo.c \
        main/pixel.c \
        main/pixelstore.c \
+       main/pixeltransfer.c \
        main/points.c \
        main/polygon.c \
        main/queryobj.c \
@@ -68,6 +71,7 @@ MAIN_SOURCES = \
        main/readpix.c \
        main/remap.c \
        main/renderbuffer.c \
+       main/samplerobj.c \
        main/scissor.c \
        main/shaderapi.c \
        main/shaderobj.c \
@@ -76,10 +80,10 @@ MAIN_SOURCES = \
        main/stencil.c \
        main/syncobj.c \
        main/texcompress.c \
+       main/texcompress_rgtc.c \
        main/texcompress_s3tc.c \
        main/texcompress_fxt1.c \
        main/texenv.c \
-       main/texenvprogram.c \
        main/texfetch.c \
        main/texformat.c \
        main/texgen.c \
@@ -88,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 \
@@ -99,6 +103,9 @@ MAIN_SOURCES = \
        main/vtxfmt.c \
        $(MAIN_ES_SOURCES)
 
+MAIN_CXX_SOURCES = \
+       main/ff_fragment_shader.cpp
+
 MATH_SOURCES = \
        math/m_debug_clip.c \
        math/m_debug_norm.c \
@@ -137,6 +144,8 @@ SWRAST_SOURCES = \
        swrast/s_stencil.c \
        swrast/s_texcombine.c \
        swrast/s_texfilter.c \
+       swrast/s_texrender.c \
+       swrast/s_texture.c \
        swrast/s_triangle.c \
        swrast/s_zoom.c
 
@@ -154,7 +163,6 @@ TNL_SOURCES = \
        tnl/t_vb_texgen.c \
        tnl/t_vb_texmat.c \
        tnl/t_vb_vertex.c \
-       tnl/t_vb_cull.c \
        tnl/t_vb_fog.c \
        tnl/t_vb_light.c \
        tnl/t_vb_normals.c \
@@ -212,8 +220,10 @@ STATETRACKER_SOURCES = \
        state_tracker/st_cb_queryobj.c \
        state_tracker/st_cb_rasterpos.c \
        state_tracker/st_cb_readpixels.c \
+       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 \
@@ -242,37 +252,20 @@ 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 \
        program/prog_statevars.c \
        program/prog_uniform.c \
        program/programopt.c \
+       program/register_allocate.c \
        program/symbol_table.c
 
+
 SHADER_CXX_SOURCES = \
-       program/ir_to_mesa.cpp
-
-SLANG_SOURCES =        \
-       slang/slang_builtin.c   \
-       slang/slang_codegen.c   \
-       slang/slang_compile.c   \
-       slang/slang_compile_function.c  \
-       slang/slang_compile_operation.c \
-       slang/slang_compile_struct.c    \
-       slang/slang_compile_variable.c  \
-       slang/slang_emit.c      \
-       slang/slang_ir.c        \
-       slang/slang_label.c     \
-       slang/slang_link.c      \
-       slang/slang_log.c       \
-       slang/slang_mem.c       \
-       slang/slang_print.c     \
-       slang/slang_simplify.c  \
-       slang/slang_storage.c   \
-       slang/slang_typeinfo.c  \
-       slang/slang_vartable.c  \
-       slang/slang_utility.c
+       program/ir_to_mesa.cpp \
+       program/sampler.cpp
 
 ASM_C_SOURCES =        \
        x86/common_x86.c \
@@ -330,7 +323,8 @@ MESA_SOURCES = \
        $(ASM_C_SOURCES)
 
 MESA_CXX_SOURCES = \
-        $(SHADER_CXX_SOURCES)
+       $(MAIN_CXX_SOURCES) \
+       $(SHADER_CXX_SOURCES)
 
 # Sources for building Gallium drivers
 MESA_GALLIUM_SOURCES = \
@@ -343,7 +337,9 @@ MESA_GALLIUM_SOURCES = \
        x86/common_x86.c
 
 MESA_GALLIUM_CXX_SOURCES = \
-        $(SHADER_CXX_SOURCES)
+       $(MAIN_CXX_SOURCES) \
+       $(SHADER_CXX_SOURCES) \
+       state_tracker/st_glsl_to_tgsi.cpp
 
 # All the core C sources, for dependency checking
 ALL_SOURCES = \
@@ -379,6 +375,7 @@ GLSL_LIBS = \
 
 INCLUDE_DIRS = \
        -I$(TOP)/include \
+       -I$(TOP)/src/glsl \
        -I$(TOP)/src/mesa \
        -I$(TOP)/src/mapi \
        -I$(TOP)/src/gallium/include \