summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mesa/sources39
1 files changed, 6 insertions, 33 deletions
diff --git a/src/mesa/sources b/src/mesa/sources
index 09692c6f15..6e6f1c0bfd 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -87,7 +87,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 \
@@ -128,7 +127,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 +147,6 @@ TNL_SOURCES = \
tnl/t_vtx_eval.c \
tnl/t_vtx_exec.c
-
-
SHADER_SOURCES = \
shader/arbprogparse.c \
shader/arbprogram.c \
@@ -165,34 +161,6 @@ SHADER_SOURCES = \
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
-
SLANG_SOURCES = \
shader/slang/slang_analyse.c \
shader/slang/slang_assemble.c \
@@ -200,18 +168,24 @@ 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_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_print.c \
shader/slang/slang_utility.c
ASM_C_SOURCES = \
@@ -324,7 +298,6 @@ SOLO_SOURCES = \
$(SWRAST_SETUP_SOURCES) \
$(ASM_C_SOURCES) \
$(SLANG_SOURCES)
-# $(SLANG_C_SOURCES)
CORE_SOURCES = \
$(GLAPI_SOURCES) \