Import Mesa 13.0.2

2 files changed, 0 insertions, 25 deletions

diff --git a/lib/mesa/src/compiler/SConscript.glsl b/lib/mesa/src/compiler/SConscript.glsl
index 7de4ff8c4..a25374fce 100644
--- a/lib/mesa/src/compiler/SConscript.glsl
+++ b/lib/mesa/src/compiler/SConscript.glsl
@@ -63,8 +63,6 @@ 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])
@@ -91,13 +89,6 @@ 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',
     source = [],
diff --git a/lib/mesa/src/compiler/SConscript.nir b/lib/mesa/src/compiler/SConscript.nir
index 41c67941f..3c685a2dc 100644
--- a/lib/mesa/src/compiler/SConscript.nir
+++ b/lib/mesa/src/compiler/SConscript.nir
@@ -59,22 +59,6 @@ env.CodeGenerate(
     command = python_cmd + ' $SCRIPT > $TARGET'
 )
 
-bldroot = Dir('.').abspath
-
-env.CodeGenerate(
-    target = 'nir/nir_intrinsics.h',
-    script = 'nir/nir_intrinsics_h.py',
-    source = [],
-    command = python_cmd + ' $SCRIPT --outdir ' + bldroot + '/nir'
-)
-
-env.CodeGenerate(
-    target = 'nir/nir_intrinsics.c',
-    script = 'nir/nir_intrinsics_c.py',
-    source = [],
-    command = python_cmd + ' $SCRIPT --outdir ' + bldroot + '/nir'
-)
-
 # parse Makefile.sources
 source_lists = env.ParseSourceList('Makefile.sources')