aco: Don't store LS VS outputs to LDS when TCS doesn't need them.

[mesa.git] / src / mapi / shared-glapi / SConscript

diff --git a/src/mapi/shared-glapi/SConscript b/src/mapi/shared-glapi/SConscript
index 26bfe7e95290c39f1f7c7ac769a7c33f395c9fad..81aea74873d43c05bbe4337d0d2de17df5576f0a 100644 (file)
--- a/src/mapi/shared-glapi/SConscript
+++ b/src/mapi/shared-glapi/SConscript
@@ -26,13 +26,28 @@ def mapi_objects(env, printer, mode):
     header_name = '%s-tmp.h' % (printer)
 
     # generate ABI header
-    header = env.CodeGenerate(
-        target = header_name,
-        script = '../mapi_abi.py',
-        source = '../glapi/gen/gl_and_es_API.xml',
-        command = python_cmd + ' $SCRIPT ' + \
-                '--printer %s --mode lib $SOURCE > $TARGET' % (printer),
-    )
+    GLAPI = '../glapi/'
+    if printer != 'glapi':
+        if printer == 'es1api':
+            abi_tag = 'glesv1'
+        else:
+            abi_tag = 'glesv2'
+
+        header = env.CodeGenerate(
+            target = header_name,
+            script = '../new/gen_gldispatch_mapi.py',
+            source = GLAPI + 'registry/gl.xml'
+            command = python_cmd + ' $SCRIPT ' + \
+                    '%s $SOURCE > $TARGET' % (abi_tag),
+        )
+    else:
+        header = env.CodeGenerate(
+            target = header_name,
+            script = '../mapi_abi.py',
+            source = [GLAPI + 'gen/gl_and_es_API.xml'] + env.Glob(GLAPI + 'gen/*.xml'),
+            command = python_cmd + ' $SCRIPT ' + \
+                    '--printer %s $SOURCE > $TARGET' % (printer),
+        )
 
     cpppath = [
         header[0].dir,
@@ -40,7 +55,7 @@ def mapi_objects(env, printer, mode):
         '#/src',
         '#/src/mapi',
     ]
-    
+
     cppdefines = mapi_defines[mode] + [
         'MAPI_ABI_HEADER=\\"%s\\"' % (header_name),
     ]
@@ -112,11 +127,4 @@ if env['platform'] == 'windows':
 else:
     shared_glapi = env.FindIxes(shared_glapi, 'SHLIBPREFIX', 'SHLIBSUFFIX')
 
-# build glapi bridge as a convenience libarary for libgl-xlib/libgl-gdi
-bridge_glapi_objects = mapi_objects(env, 'glapi', 'bridge')
-bridge_glapi = env.ConvenienceLibrary(
-    target = 'glapi_bridge',
-    source = bridge_glapi_objects,
-)
-
-Export(['shared_glapi', 'bridge_glapi'])
+Export(['shared_glapi'])