mesa: Only complain about an infinite loop in a swrast program once.

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

diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index 9ac850ecf81e512c8af6e77095324e10ff2b97de..117b3f3d2b9e6fd58800b12722a74278a0e2955a 100644 (file)
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -3,9 +3,7 @@
 # this is part of MAIN_SOURCES
 MAIN_ES_SOURCES = \
        main/api_exec_es1.c \
-       main/api_exec_es2.c \
-       main/get_es1.c \
-       main/get_es2.c
+       main/api_exec_es2.c
 
 MAIN_SOURCES = \
        main/api_arrayelt.c \
@@ -96,15 +94,6 @@ MAIN_SOURCES = \
        main/vtxfmt.c \
        $(MAIN_ES_SOURCES)
 
-GLAPI_SOURCES = \
-       glapi/glapi.c \
-       glapi/glapi_dispatch.c \
-       glapi/glapi_entrypoint.c \
-       glapi/glapi_execmem.c \
-       glapi/glapi_getproc.c \
-       glapi/glapi_nop.c \
-       glapi/glthread.c
-
 MATH_SOURCES = \
        math/m_debug_clip.c \
        math/m_debug_norm.c \
@@ -193,6 +182,7 @@ STATETRACKER_SOURCES = \
        state_tracker/st_atom_constbuf.c \
        state_tracker/st_atom_depth.c \
        state_tracker/st_atom_framebuffer.c \
+       state_tracker/st_atom_msaa.c \
        state_tracker/st_atom_pixeltransfer.c \
        state_tracker/st_atom_sampler.c \
        state_tracker/st_atom_scissor.c \
@@ -219,6 +209,8 @@ STATETRACKER_SOURCES = \
        state_tracker/st_cb_readpixels.c \
        state_tracker/st_cb_strings.c \
        state_tracker/st_cb_texture.c \
+       state_tracker/st_cb_viewport.c \
+       state_tracker/st_cb_xformfb.c \
        state_tracker/st_context.c \
        state_tracker/st_debug.c \
        state_tracker/st_draw.c \
@@ -255,7 +247,11 @@ SHADER_SOURCES = \
        shader/prog_uniform.c \
        shader/programopt.c \
        shader/symbol_table.c \
-       shader/shader_api.c
+       shader/shader_api.c \
+       shader/uniforms.c
+
+SHADER_CXX_SOURCES = \
+       shader/ir_to_mesa.cpp
 
 SLANG_SOURCES =        \
        shader/slang/slang_builtin.c    \
@@ -307,23 +303,14 @@ X86_SOURCES =                     \
        x86/sse_normal.S        \
        x86/read_rgba_span_x86.S
 
-X86_API =                      \
-       glapi/glapi_x86.S
-
 X86-64_SOURCES =               \
        x86-64/xform4.S
 
-X86-64_API =                   \
-       glapi/glapi_x86-64.S
-
 SPARC_SOURCES =                        \
        sparc/clip.S            \
        sparc/norm.S            \
        sparc/xform.S
 
-SPARC_API =                    \
-       glapi/glapi_sparc.S
-
 COMMON_DRIVER_SOURCES =                        \
        drivers/common/driverfuncs.c    \
        drivers/common/meta.c
@@ -340,8 +327,10 @@ MESA_SOURCES = \
        $(SWRAST_SOURCES)       \
        $(SWRAST_SETUP_SOURCES) \
        $(COMMON_DRIVER_SOURCES)\
-       $(ASM_C_SOURCES)        \
-       $(SLANG_SOURCES)
+       $(ASM_C_SOURCES)
+
+MESA_CXX_SOURCES = \
+        $(SHADER_CXX_SOURCES)
 
 # Sources for building Gallium drivers
 MESA_GALLIUM_SOURCES = \
@@ -351,13 +340,15 @@ MESA_GALLIUM_SOURCES = \
        $(STATETRACKER_SOURCES) \
        $(SHADER_SOURCES)       \
        ppc/common_ppc.c        \
-       x86/common_x86.c        \
-       $(SLANG_SOURCES)
+       x86/common_x86.c
+
+MESA_GALLIUM_CXX_SOURCES = \
+        $(SHADER_CXX_SOURCES)
 
 # All the core C sources, for dependency checking
 ALL_SOURCES = \
        $(MESA_SOURCES)         \
-       $(GLAPI_SOURCES)        \
+       $(MESA_CXX_SOURCES)     \
        $(MESA_ASM_SOURCES)     \
        $(STATETRACKER_SOURCES)
 
@@ -366,16 +357,14 @@ 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)
 
-GLAPI_OBJECTS = \
-       $(GLAPI_SOURCES:.c=.o) \
-       $(GLAPI_ASM_SOURCES:.S=.o)
-
 
 COMMON_DRIVER_OBJECTS = $(COMMON_DRIVER_SOURCES:.c=.o)
 
@@ -383,8 +372,7 @@ 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
@@ -392,5 +380,6 @@ GLSL_LIBS = \
 INCLUDE_DIRS = \
        -I$(TOP)/include \
        -I$(TOP)/src/mesa \
+       -I$(TOP)/src/mapi \
        -I$(TOP)/src/gallium/include \
        -I$(TOP)/src/gallium/auxiliary