projects / mesa.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
r5xx: Fixup emit_tex, add debugging info, enable temp temps.
[mesa.git] / src / mesa / sources
diff --git a/src/mesa/sources b/src/mesa/sources
index b589111a19be7d58763ceb2d707c37620be46f9a..dbfc01d0edfb2270ee27b4e930a2ad2d2b4ef90c 100644 (file)
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -41,13 +41,14 @@ MAIN_SOURCES = \
        main/matrix.c \
        main/mipmap.c \
        main/mm.c \
-       main/occlude.c \
        main/pixel.c \
        main/points.c \
        main/polygon.c \
+       main/queryobj.c \
        main/rastpos.c \
        main/rbadaptors.c \
        main/renderbuffer.c \
+       main/shaders.c \
        main/state.c \
        main/stencil.c \
        main/texcompress.c \
@@ -83,7 +84,6 @@ SWRAST_SOURCES = \
        swrast/s_aatriangle.c \
        swrast/s_accum.c \
        swrast/s_alpha.c \
-       swrast/s_arbshader.c \
        swrast/s_atifragshader.c \
        swrast/s_bitmap.c \
        swrast/s_blend.c \
@@ -95,11 +95,11 @@ SWRAST_SOURCES = \
        swrast/s_drawpix.c \
        swrast/s_feedback.c \
        swrast/s_fog.c \
+       swrast/s_fragprog.c \
        swrast/s_imaging.c \
        swrast/s_lines.c \
        swrast/s_logic.c \
        swrast/s_masking.c \
-       swrast/s_nvfragprog.c \
        swrast/s_points.c \
        swrast/s_readpix.c \
        swrast/s_span.c \
@@ -118,9 +118,6 @@ TNL_SOURCES = \
        tnl/t_context.c \
        tnl/t_pipeline.c \
        tnl/t_draw.c \
-       tnl/t_vb_arbprogram.c \
-       tnl/t_vb_arbprogram_sse.c \
-       tnl/t_vb_arbshader.c\
        tnl/t_vb_program.c \
        tnl/t_vb_render.c \
        tnl/t_vb_texgen.c \
@@ -143,6 +140,10 @@ VBO_SOURCES = \
        vbo/vbo_exec_array.c \
        vbo/vbo_exec_draw.c \
        vbo/vbo_exec_eval.c \
+       vbo/vbo_rebase.c \
+       vbo/vbo_split.c \
+       vbo/vbo_split_copy.c \
+       vbo/vbo_split_inplace.c \
        vbo/vbo_save.c \
        vbo/vbo_save_api.c \
        vbo/vbo_save_draw.c \
@@ -156,60 +157,38 @@ SHADER_SOURCES = \
        shader/grammar/grammar_mesa.c \
        shader/nvfragparse.c \
        shader/nvprogram.c \
-       shader/nvvertexec.c \
        shader/nvvertparse.c \
        shader/program.c \
+       shader/prog_debug.c \
+       shader/prog_execute.c \
+       shader/prog_instruction.c \
+       shader/prog_parameter.c \
+       shader/prog_print.c \
+       shader/prog_statevars.c \
        shader/programopt.c \
-       shader/shaderobjects.c \
-       shader/shaderobjects_3dlabs.c
-
-SLANG_C_SOURCES = \
-       shader/slang/MachineIndependent/preprocessor/atom.c \
-       shader/slang/MachineIndependent/preprocessor/cpp.c \
-       shader/slang/MachineIndependent/preprocessor/cppstruct.c \
-       shader/slang/MachineIndependent/preprocessor/memory.c \
-       shader/slang/MachineIndependent/preprocessor/scanner.c \
-       shader/slang/MachineIndependent/preprocessor/symbols.c \
-       shader/slang/MachineIndependent/preprocessor/tokens.c
-
-SLANG_CPP_SOURCES = \
-       shader/slang/slang_mesa.cpp     \
-       shader/slang/MachineIndependent/Gen_glslang.cpp \
-       shader/slang/MachineIndependent/Gen_glslang_tab.cpp     \
-       shader/slang/MachineIndependent/InfoSink.cpp    \
-       shader/slang/MachineIndependent/Initialize.cpp  \
-       shader/slang/MachineIndependent/Intermediate.cpp        \
-       shader/slang/MachineIndependent/intermOut.cpp   \
-       shader/slang/MachineIndependent/IntermTraverse.cpp      \
-       shader/slang/MachineIndependent/parseConst.cpp  \
-       shader/slang/MachineIndependent/ParseHelper.cpp \
-       shader/slang/MachineIndependent/PoolAlloc.cpp   \
-       shader/slang/MachineIndependent/QualifierAlive.cpp      \
-       shader/slang/MachineIndependent/RemoveTree.cpp  \
-       shader/slang/MachineIndependent/ShaderLang.cpp  \
-       shader/slang/MachineIndependent/SymbolTable.cpp \
-       shader/slang/OGLCompilersDLL/Initialisation.cpp \
-       shader/slang/OSDependent/Linux/ossource.cpp
+       shader/shader_api.c \
 
 SLANG_SOURCES =        \
-       shader/slang/slang_analyse.c    \
-       shader/slang/slang_assemble.c   \
-       shader/slang/slang_assemble_assignment.c        \
-       shader/slang/slang_assemble_conditional.c       \
-       shader/slang/slang_assemble_constructor.c       \
-       shader/slang/slang_assemble_typeinfo.c  \
+       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_execute.c    \
-       shader/slang/slang_export.c     \
+       shader/slang/slang_emit.c       \
+       shader/slang/slang_ir.c \
+       shader/slang/slang_label.c      \
        shader/slang/slang_library_noise.c      \
-       shader/slang/slang_library_texsample.c  \
        shader/slang/slang_link.c       \
+       shader/slang/slang_log.c        \
+       shader/slang/slang_mem.c        \
        shader/slang/slang_preprocess.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
 
 ASM_C_SOURCES =        \
@@ -220,8 +199,7 @@ ASM_C_SOURCES =     \
        x86/rtasm/x86sse.c \
        sparc/sparc.c \
        ppc/common_ppc.c \
-       x86-64/x86-64.c \
-       shader/slang/slang_execute_x86.c
+       x86-64/x86-64.c
 
 X86_SOURCES =                  \
        x86/common_x86_asm.S    \
@@ -240,8 +218,7 @@ X86_SOURCES =                       \
        x86/sse_xform3.S        \
        x86/sse_xform4.S        \
        x86/sse_normal.S        \
-       x86/read_rgba_span_x86.S \
-       tnl/t_vtx_x86_gcc.S
+       x86/read_rgba_span_x86.S
 
 X86_API =                      \
        x86/glapi_x86.S
@@ -270,6 +247,7 @@ X11_DRIVER_SOURCES =                \
        drivers/x11/xm_api.c    \
        drivers/x11/xm_buffer.c \
        drivers/x11/xm_dd.c     \
+       drivers/x11/xm_glide.c  \
        drivers/x11/xm_line.c   \
        drivers/x11/xm_span.c   \
        drivers/x11/xm_tri.c
@@ -322,7 +300,6 @@ SOLO_SOURCES = \
        $(SWRAST_SETUP_SOURCES) \
        $(ASM_C_SOURCES)        \
        $(SLANG_SOURCES)
-#      $(SLANG_C_SOURCES)
 
 CORE_SOURCES = \
        $(GLAPI_SOURCES)        \
@@ -361,7 +338,5 @@ INCLUDE_DIRS = \
        -I$(TOP)/src/mesa/shader \
        -I$(TOP)/src/mesa/shader/grammar \
        -I$(TOP)/src/mesa/shader/slang \
-       -I$(TOP)/src/mesa/shader/slang/OSDependent/Linux \
-       -I$(TOP)/src/mesa/shader/slang/OGLCompilersDLL \
        -I$(TOP)/src/mesa/swrast \
        -I$(TOP)/src/mesa/swrast_setup