additional assertions, bump up MAX_EXEC

[mesa.git] / src / mesa / sources

diff --git a/src/mesa/sources b/src/mesa/sources
index 5d9f2d3c05ae02faab3cfd21864d8aff7b1fe151..d0b7246ed61c23b0c172c6f72bbac906c279d9ed 100644 (file)
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -48,6 +48,7 @@ MAIN_SOURCES = \
        main/rastpos.c \
        main/rbadaptors.c \
        main/renderbuffer.c \
+       main/shaders.c \
        main/state.c \
        main/stencil.c \
        main/texcompress.c \
@@ -87,7 +88,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 \
@@ -99,11 +99,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 \
@@ -128,7 +128,6 @@ TNL_SOURCES = \
        tnl/t_save_playback.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 \
@@ -149,8 +148,6 @@ TNL_SOURCES = \
        tnl/t_vtx_eval.c \
        tnl/t_vtx_exec.c 
 
-
-
 SHADER_SOURCES = \
        shader/arbprogparse.c \
        shader/arbprogram.c \
@@ -161,37 +158,12 @@ SHADER_SOURCES = \
        shader/nvvertexec.c \
        shader/nvvertparse.c \
        shader/program.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    \
@@ -200,18 +172,26 @@ SLANG_SOURCES =   \
        shader/slang/slang_assemble_conditional.c       \
        shader/slang/slang_assemble_constructor.c       \
        shader/slang/slang_assemble_typeinfo.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_error.c      \
        shader/slang/slang_execute.c    \
        shader/slang/slang_export.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_link2.c      \
        shader/slang/slang_preprocess.c \
+       shader/slang/slang_simplify.c   \
        shader/slang/slang_storage.c    \
+       shader/slang/slang_vartable.c   \
+       shader/slang/slang_print.c      \
        shader/slang/slang_utility.c
 
 ASM_C_SOURCES =        \
@@ -308,7 +288,7 @@ FBDEV_DRIVER_SOURCES =                      \
 ALL_SOURCES = \
        $(GLAPI_SOURCES)        \
        $(SOLO_SOURCES)         \
-       $(X86_SOURCES)          \
+       $(ASM_SOURCES)          \
        $(COMMON_DRIVER_SOURCES)\
        $(X11_DRIVER_SOURCES)   \
        $(FBDEV_DRIVER_SOURCES) \
@@ -324,7 +304,6 @@ SOLO_SOURCES = \
        $(SWRAST_SETUP_SOURCES) \
        $(ASM_C_SOURCES)        \
        $(SLANG_SOURCES)
-#      $(SLANG_C_SOURCES)
 
 CORE_SOURCES = \
        $(GLAPI_SOURCES)        \
@@ -363,7 +342,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