anv/meta_clear: Don't trash state if no clears are needed

[mesa.git] / src / glx / SConscript

diff --git a/src/glx/SConscript b/src/glx/SConscript
index ef372d01765f3aebd290ce68477ed71fa915000f..619e4c373ed533d43c9df6f50a4ede55cd594b56 100644 (file)
--- a/src/glx/SConscript
+++ b/src/glx/SConscript
@@ -11,6 +11,8 @@ env.Prepend(CPPPATH = [
        '.',           # the build/<platform>/glx/ directory
        '#include',
        '#include/GL/internal',
+       '#src/',
+       '#src/loader',
        '#src/mesa',
        '#src/mapi',
        '#src/mapi/glapi',
@@ -26,6 +28,7 @@ env.Append(CPPDEFINES = [
 ])
 
 env.Prepend(LIBS = [
+    libloader,
     glapi
 ])
 
@@ -63,6 +66,7 @@ sources = [
     'indirect_vertex_program.c',
     'pixel.c',
     'pixelstore.c',
+    'query_renderer.c',
     'render2.c',
     'renderpix.c',
     'single2.c',
@@ -78,7 +82,8 @@ sources = [
     'glxhash.c',
     'dri2_glx.c',
     'dri2.c',
-    'dri2_query_renderer.c',
+    'dri_common_query_renderer.c',
+    #'dri3_glx.c',
     'applegl_glx.c',
 ]
 
@@ -120,7 +125,7 @@ env.CodeGenerate(
     target = 'indirect_size.h',
     script = GLAPI + 'gen/glX_proto_size.py',
     source = sources,
-    command = python_cmd + ' $SCRIPT -f $SOURCE -m size_h --only-set -h _INDIRECT_SIZE_H > $TARGET'
+    command = python_cmd + ' $SCRIPT -f $SOURCE -m size_h --only-set --header-tag _INDIRECT_SIZE_H > $TARGET'
 )
 
 env.CodeGenerate(