spirv: Change spirv_to_nir() to return a nir_shader

[mesa.git] / src / mesa / SConscript

diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 9398ddb13bfa6064e839155bf1cdaac4d90ca827..eaf23fbae1865b2fe99c7a3b8b60420f7a86a588 100644 (file)
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -27,13 +27,7 @@ if env['platform'] == 'windows':
     env.Append(CPPDEFINES = [
         '_GDI32_', # prevent gl* being declared __declspec(dllimport) in MS headers
         'BUILD_GL32', # declare gl* as __declspec(dllexport) in Mesa headers
-    ])
-    if not env['gles']:
-        # prevent _glapi_* from being declared __declspec(dllimport)
-        env.Append(CPPDEFINES = ['_GLAPI_NO_EXPORTS'])
-else:
-    env.Append(CPPDEFINES = [
-        ('HAVE_DLOPEN', '1'),
+        '_GLAPI_NO_EXPORTS', # prevent _glapi_* from being declared __declspec(dllimport)
     ])
 
 # parse Makefile.sources
@@ -46,6 +40,7 @@ env.CFile('program/program_parse.tab.c', 'program/program_parse.y')
 mesa_sources = (
     source_lists['MESA_FILES'] +
     source_lists['PROGRAM_FILES'] +
+    source_lists['PROGRAM_NIR_FILES'] +
     source_lists['STATETRACKER_FILES']
 )
 
@@ -79,6 +74,13 @@ format_unpack = env.CodeGenerate(
       command = python_cmd + ' $SCRIPT ' + ' $SOURCE > $TARGET'
 )
 
+format_fallback = env.CodeGenerate(
+      target = 'main/format_fallback.c',
+      script = 'main/format_fallback.py',
+      source = 'main/formats.csv',
+      command = python_cmd + ' $SCRIPT ' + ' $SOURCE ' + ' $TARGET'
+)
+
 #
 # Assembly sources
 #
@@ -122,7 +124,7 @@ if env['platform'] not in ('cygwin', 'darwin', 'windows', 'haiku'):
 env.CodeGenerate(
     target = 'main/marshal_generated.c',
     script = GLAPI + 'gen/gl_marshal.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'
     )
 
@@ -130,7 +132,7 @@ env.CodeGenerate(
 env.CodeGenerate(
     target = 'main/marshal_generated.h',
     script = GLAPI + 'gen/gl_marshal_h.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'
     )