Merge branch '7.8'

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

diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index a7a3b9a7f97d1e65d71a800a80123fe5d21c25ad..74885548e5a2abfd8b5539919621c2506241beaf 100644 (file)
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -15,6 +15,7 @@ MAIN_SOURCES = \
        main/clear.c \
        main/clip.c \
        main/colortab.c \
+       main/condrender.c \
        main/context.c \
        main/convolve.c \
        main/cpuinfo.c \
@@ -80,13 +81,16 @@ MAIN_SOURCES = \
        main/texstate.c \
        main/texstore.c \
        main/varray.c \
+       main/version.c \
        main/viewport.c \
        main/vtxfmt.c
 
 GLAPI_SOURCES = \
-       main/dispatch.c \
        glapi/glapi.c \
+       glapi/glapi_dispatch.c \
+       glapi/glapi_entrypoint.c \
        glapi/glapi_getproc.c \
+       glapi/glapi_nop.c \
        glapi/glthread.c
 
 MATH_SOURCES = \
@@ -190,6 +194,7 @@ STATETRACKER_SOURCES = \
        state_tracker/st_cb_blit.c \
        state_tracker/st_cb_bufferobjects.c \
        state_tracker/st_cb_clear.c \
+       state_tracker/st_cb_condrender.c \
        state_tracker/st_cb_flush.c \
        state_tracker/st_cb_drawpixels.c \
        state_tracker/st_cb_fbo.c \
@@ -200,8 +205,6 @@ 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_api.c \
        state_tracker/st_context.c \
        state_tracker/st_debug.c \
        state_tracker/st_draw.c \