Merge branch 'llvm-cliptest-viewport'

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

diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index 373f1b50d0592b54e725c32920e94b1fb46bfff1..11a93d47f6d8d359be2fd6c6763f8a78eb1d5d5a 100644 (file)
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -154,7 +154,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 \
@@ -248,31 +247,12 @@ PROGRAM_SOURCES = \
        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 \
@@ -379,6 +359,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 \