projects / mesa.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
i915: Add support for HW rendering with no color draw buffer.
[mesa.git] / src / mesa / sources.mak
diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index 41104cd0aa50a4206dc4b5659c57eb9da698137b..4b2ec08bbb0d87b792172ac9380d1fcb26f5c653 100644 (file)
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -12,6 +12,7 @@ MAIN_SOURCES = \
        main/api_noop.c \
        main/api_validate.c \
        main/accum.c \
+       main/arbprogram.c \
        main/atifragshader.c \
        main/attrib.c \
        main/arrayobj.c \
@@ -56,8 +57,12 @@ MAIN_SOURCES = \
        main/mipmap.c \
        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 \
@@ -66,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 \
@@ -74,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 \
@@ -86,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 \
@@ -97,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 \
@@ -135,6 +144,7 @@ SWRAST_SOURCES = \
        swrast/s_stencil.c \
        swrast/s_texcombine.c \
        swrast/s_texfilter.c \
+       swrast/s_texrender.c \
        swrast/s_triangle.c \
        swrast/s_zoom.c
 
@@ -152,7 +162,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 \
@@ -210,8 +219,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 \
@@ -226,50 +237,33 @@ STATETRACKER_SOURCES = \
        state_tracker/st_program.c \
        state_tracker/st_texture.c
 
-SHADER_SOURCES = \
-       shader/arbprogparse.c \
-       shader/arbprogram.c \
-       shader/hash_table.c \
-       shader/lex.yy.c \
-       shader/nvfragparse.c \
-       shader/nvprogram.c \
-       shader/nvvertparse.c \
-       shader/program.c \
-       shader/program_parse.tab.c \
-       shader/program_parse_extra.c \
-       shader/prog_cache.c \
-       shader/prog_execute.c \
-       shader/prog_instruction.c \
-       shader/prog_noise.c \
-       shader/prog_optimize.c \
-       shader/prog_parameter.c \
-       shader/prog_parameter_layout.c \
-       shader/prog_print.c \
-       shader/prog_statevars.c \
-       shader/prog_uniform.c \
-       shader/programopt.c \
-       shader/symbol_table.c
-
-SLANG_SOURCES =        \
-       shader/slang/slang_builtin.c    \
-       shader/slang/slang_codegen.c    \
-       shader/slang/slang_compile.c    \
-       shader/slang/slang_compile_function.c   \
-       shader/slang/slang_compile_operation.c  \
-       shader/slang/slang_compile_struct.c     \
-       shader/slang/slang_compile_variable.c   \
-       shader/slang/slang_emit.c       \
-       shader/slang/slang_ir.c \
-       shader/slang/slang_label.c      \
-       shader/slang/slang_link.c       \
-       shader/slang/slang_log.c        \
-       shader/slang/slang_mem.c        \
-       shader/slang/slang_print.c      \
-       shader/slang/slang_simplify.c   \
-       shader/slang/slang_storage.c    \
-       shader/slang/slang_typeinfo.c   \
-       shader/slang/slang_vartable.c   \
-       shader/slang/slang_utility.c
+PROGRAM_SOURCES = \
+       program/arbprogparse.c \
+       program/hash_table.c \
+       program/lex.yy.c \
+       program/nvfragparse.c \
+       program/nvvertparse.c \
+       program/program.c \
+       program/program_parse.tab.c \
+       program/program_parse_extra.c \
+       program/prog_cache.c \
+       program/prog_execute.c \
+       program/prog_instruction.c \
+       program/prog_noise.c \
+       program/prog_optimize.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 \
+       program/sampler.cpp
 
 ASM_C_SOURCES =        \
        x86/common_x86.c \
@@ -320,12 +314,15 @@ MESA_SOURCES = \
        $(MATH_XFORM_SOURCES)   \
        $(VBO_SOURCES)          \
        $(TNL_SOURCES)          \
-       $(SHADER_SOURCES)       \
+       $(PROGRAM_SOURCES)      \
        $(SWRAST_SOURCES)       \
        $(SWRAST_SETUP_SOURCES) \
        $(COMMON_DRIVER_SOURCES)\
-       $(ASM_C_SOURCES)        \
-       $(SLANG_SOURCES)
+       $(ASM_C_SOURCES)
+
+MESA_CXX_SOURCES = \
+       $(MAIN_CXX_SOURCES) \
+       $(SHADER_CXX_SOURCES)
 
 # Sources for building Gallium drivers
 MESA_GALLIUM_SOURCES = \
@@ -333,14 +330,18 @@ MESA_GALLIUM_SOURCES = \
        $(MATH_SOURCES)         \
        $(VBO_SOURCES)          \
        $(STATETRACKER_SOURCES) \
-       $(SHADER_SOURCES)       \
+       $(PROGRAM_SOURCES)      \
        ppc/common_ppc.c        \
-       x86/common_x86.c        \
-       $(SLANG_SOURCES)
+       x86/common_x86.c
+
+MESA_GALLIUM_CXX_SOURCES = \
+       $(MAIN_CXX_SOURCES) \
+       $(SHADER_CXX_SOURCES)
 
 # All the core C sources, for dependency checking
 ALL_SOURCES = \
        $(MESA_SOURCES)         \
+       $(MESA_CXX_SOURCES)     \
        $(MESA_ASM_SOURCES)     \
        $(STATETRACKER_SOURCES)
 
@@ -349,10 +350,12 @@ ALL_SOURCES = \
 
 MESA_OBJECTS = \
        $(MESA_SOURCES:.c=.o) \
+       $(MESA_CXX_SOURCES:.cpp=.o) \
        $(MESA_ASM_SOURCES:.S=.o)
 
 MESA_GALLIUM_OBJECTS = \
        $(MESA_GALLIUM_SOURCES:.c=.o) \
+       $(MESA_GALLIUM_CXX_SOURCES:.cpp=.o) \
        $(MESA_ASM_SOURCES:.S=.o)
 
 
@@ -362,14 +365,14 @@ COMMON_DRIVER_OBJECTS = $(COMMON_DRIVER_SOURCES:.c=.o)
 ### Other archives/libraries
 
 GLSL_LIBS = \
-       $(TOP)/src/glsl/pp/libglslpp.a \
-       $(TOP)/src/glsl/cl/libglslcl.a
+       $(TOP)/src/glsl/libglsl.a
 
 
 ### Include directories
 
 INCLUDE_DIRS = \
        -I$(TOP)/include \
+       -I$(TOP)/src/glsl \
        -I$(TOP)/src/mesa \
        -I$(TOP)/src/mapi \
        -I$(TOP)/src/gallium/include \