nir: fix a bug in is_dual_slot in nir_io_add_const_offset_to_base

[mesa.git] / src / compiler / SConscript.glsl

diff --git a/src/compiler/SConscript.glsl b/src/compiler/SConscript.glsl
index f2553693a7aa9242c2b683df6b14165f775eecc6..85abfbac78ad677155dcc538a790f3c6c4b13e4d 100644 (file)
--- a/src/compiler/SConscript.glsl
+++ b/src/compiler/SConscript.glsl
@@ -63,17 +63,17 @@ source_lists = env.ParseSourceList('Makefile.sources')
 for l in ('LIBGLCPP_FILES', 'LIBGLSL_FILES'):
     glsl_sources += source_lists[l]
 
+glsl_sources += env.StaticObject("glsl/glcpp/pp_standalone_scaffolding.c")
+
 if env['msvc']:
     env.Prepend(CPPPATH = ['#/src/getopt'])
     env.PrependUnique(LIBS = [getopt])
 
 # Copy these files to avoid generation object files into src/mesa/program
 env.Prepend(CPPPATH = ['#src/mesa/main'])
-env.Command('glsl/imports.c', '#src/mesa/main/imports.c', Copy('$TARGET', '$SOURCE'))
 env.Command('glsl/extensions_table.c', '#src/mesa/main/extensions_table.c', Copy('$TARGET', '$SOURCE'))
 # Copy these files to avoid generation object files into src/mesa/program
 env.Prepend(CPPPATH = ['#src/mesa/program'])
-env.Command('glsl/prog_hash_table.c', '#src/mesa/program/prog_hash_table.c', Copy('$TARGET', '$SOURCE'))
 env.Command('glsl/symbol_table.c', '#src/mesa/program/symbol_table.c', Copy('$TARGET', '$SOURCE'))
 env.Command('glsl/dummy_errors.c', '#src/mesa/program/dummy_errors.c', Copy('$TARGET', '$SOURCE'))
 
@@ -81,8 +81,6 @@ compiler_objs = env.StaticObject(source_lists['GLSL_COMPILER_CXX_FILES'])
 
 mesa_objs = env.StaticObject([
     'glsl/extensions_table.c',
-    'glsl/imports.c',
-    'glsl/prog_hash_table.c',
     'glsl/symbol_table.c',
     'glsl/dummy_errors.c',
 ])
@@ -90,6 +88,13 @@ mesa_objs = env.StaticObject([
 compiler_objs += mesa_objs
 
 # GLSL generated sources
+env.CodeGenerate(
+    target = 'glsl/float64_glsl.h',
+    script = 'glsl/xxd.py',
+    source = ['glsl/float64.glsl'],
+    command = python_cmd + ' $SCRIPT $SOURCE $TARGET -n float64_source',
+)
+
 env.CodeGenerate(
     target = 'glsl/ir_expression_operation.h',
     script = 'glsl/ir_expression_operation.py',