glsl: use last_vert_prog to get last {clip,cull}_distance_array_size

[mesa.git] / src / mesa / SConscript

diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index f72e380097a36b164bd1f9a2e65dabcc49f546a3..e375de6ee77b7f4372abe95452b141e6060ba220 100644 (file)
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -11,10 +11,10 @@ env.MSVC2013Compat()
 
 env.Append(CPPPATH = [
     '../compiler/nir',  # for generated nir_opcodes.h, etc
+    '../compiler/glsl',  # for generated headers
     '#/src',
     Dir('../mapi'), # src/mapi build path
     '#/src/mapi',
-    '#/src/glsl',
     Dir('.'), # src/mesa build path
     '#/src/mesa',
     Dir('main'),  # src/mesa/main/ build path
@@ -54,7 +54,7 @@ GLAPI = '#src/mapi/glapi/'
 get_hash_header = env.CodeGenerate(
       target = 'main/get_hash.h',
       script = 'main/get_hash_generator.py',
-      source = GLAPI + 'gen/gl_and_es_API.xml',
+      source = [GLAPI + 'gen/gl_and_es_API.xml'] + env.Glob(GLAPI + 'gen/*.xml'),
       command = python_cmd + ' $SCRIPT ' + ' -f $SOURCE > $TARGET'
 )