i915g: Use X tiling for textures

[mesa.git] / src / glsl / SConscript

diff --git a/src/glsl/SConscript b/src/glsl/SConscript
index f8e872368c263cf51820d1bd7effc4742cc871db..6314c75518b2ec6ceea8eb810b71aafcde10c89f 100644 (file)
--- a/src/glsl/SConscript
+++ b/src/glsl/SConscript
@@ -14,10 +14,10 @@ env.Prepend(CPPPATH = [
     '#src/glsl/glcpp',
 ])
 
-# Make glcpp/glcpp-parse.h and glsl_parser.h reacheable from the include path
-env.Append(CPPPATH = [Dir('.').abspath])
+# Make glcpp-parse.h and glsl_parser.h reachable from the include path.
+env.Append(CPPPATH = [Dir('.').abspath, Dir('glcpp').abspath])
 
-env.Append(YACCFLAGS = '-d')
+env.Append(YACCFLAGS = '-d -p "glcpp_parser_"')
 
 parser_env = env.Clone()
 parser_env.Append(YACCFLAGS = [
@@ -25,6 +25,10 @@ parser_env.Append(YACCFLAGS = [
     '-p', '_mesa_glsl_',
 ])
 
+# without this line scons will expect "glsl_parser.hpp" instead of
+# "glsl_parser.h", causing glsl_parser.cpp to be regenerated every time
+parser_env['YACCHXXFILESUFFIX'] = '.h'
+
 glcpp_lexer = env.CFile('glcpp/glcpp-lex.c', 'glcpp/glcpp-lex.l')
 glcpp_parser = env.CFile('glcpp/glcpp-parse.c', 'glcpp/glcpp-parse.y')
 glsl_lexer = parser_env.CXXFile('glsl_lexer.cpp', 'glsl_lexer.ll')
@@ -83,7 +87,7 @@ else:
         command = python_cmd + ' $SCRIPT $SOURCE > $TARGET'
     )
 
-    env.Depends(builtin_glsl_function, ['builtins/tools/generate_builtins.py', 'builtins/tools/texture_builtins.py'] + Glob('builtins/ir/*'))
+    env.Depends(builtin_glsl_function, ['builtins/tools/generate_builtins.py', '#src/glsl/builtins/tools/texture_builtins.py'] + Glob('builtins/ir/*'))
 
     Export('builtin_glsl_function')