mesa/cs: Add dispatch API stubs for ARB_compute_shader.

[mesa.git] / src / mesa / SConscript

diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index ca9b70bad931f492a9cde28d208ff61a47520c52..b52bbdc23d45b0a1604465ca8ef5f72b027c1447 100644 (file)
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -18,9 +18,6 @@ env.Append(CPPPATH = [
     Dir('.'), # src/mesa build path
 ])
 
-enabled_apis = []
-enabled_apis += ['GL']
-
 if env['platform'] == 'windows':
     env.Append(CPPDEFINES = [
         '_GDI32_', # prevent gl* being declared __declspec(dllimport) in MS headers
@@ -31,7 +28,6 @@ if env['platform'] == 'windows':
         env.Append(CPPDEFINES = ['_GLAPI_NO_EXPORTS'])
 else:
     env.Append(CPPDEFINES = [
-        'IN_DRI_DRIVER', # enable the remap table (for DRI drivers)
         ('HAVE_DLOPEN', '1'),
     ])
 
@@ -50,11 +46,13 @@ main_sources = [
     'main/attrib.c',
     'main/arrayobj.c',
     'main/blend.c',
+    'main/blit.c',
     'main/bufferobj.c',
     'main/buffers.c',
     'main/clear.c',
     'main/clip.c',
     'main/colortab.c',
+    'main/compute.c',
     'main/condrender.c',
     'main/context.c',
     'main/convolve.c',
@@ -81,6 +79,7 @@ main_sources = [
     'main/format_pack.c',
     'main/format_unpack.c',
     'main/framebuffer.c',
+    'main/genmipmap.c',
     'main/getstring.c',
     'main/glformats.c',
     'main/hash.c',
@@ -95,8 +94,10 @@ main_sources = [
     'main/mipmap.c',
     'main/mm.c',
     'main/multisample.c',
+    'main/objectlabel.c',
     'main/pack.c',
     'main/pbo.c',
+    'main/performance_monitor.c',
     'main/pixel.c',
     'main/pixelstore.c',
     'main/pixeltransfer.c',
@@ -112,6 +113,7 @@ main_sources = [
     'main/scissor.c',
     'main/set.c',
     'main/shaderapi.c',
+    'main/shaderimage.c',
     'main/shaderobj.c',
     'main/shader_query.cpp',
     'main/shared.c',
@@ -135,10 +137,12 @@ main_sources = [
     'main/texstorage.c',
     'main/texstore.c',
     'main/texturebarrier.c',
+    'main/textureview.c',
     'main/transformfeedback.c',
     'main/uniform_query.cpp',
     'main/uniforms.c',
     'main/varray.c',
+    'main/vdpau.c',
     'main/version.c',
     'main/viewport.c',
     'main/vtxfmt.c',
@@ -263,6 +267,7 @@ statetracker_sources = [
     'state_tracker/st_cb_eglimage.c',
     'state_tracker/st_cb_fbo.c',
     'state_tracker/st_cb_feedback.c',
+    'state_tracker/st_cb_msaa.c',
     'state_tracker/st_cb_program.c',
     'state_tracker/st_cb_queryobj.c',
     'state_tracker/st_cb_rasterpos.c',
@@ -285,6 +290,7 @@ statetracker_sources = [
     'state_tracker/st_mesa_to_tgsi.c',
     'state_tracker/st_program.c',
     'state_tracker/st_texture.c',
+    'state_tracker/st_vdpau.c',
 ]
 
 env.Append(YACCFLAGS = '-d -p "_mesa_program_"')
@@ -336,26 +342,18 @@ mesa_sources = (
 
 GLAPI = '#src/mapi/glapi/'
 
-if env['gles']:
-
-    enabled_apis += ['ES1', 'ES2']
-
-env.Append(CPPDEFINES = ["FEATURE_%s=1" % api for api in enabled_apis])
-
-get_hash_gen_opts = ' '.join(["-a %s" % api for api in enabled_apis])
-
 get_hash_header = env.CodeGenerate(
       target = 'main/get_hash.h',
       script = 'main/get_hash_generator.py',
       source = GLAPI + 'gen/gl_and_es_API.xml',
-      command = python_cmd + ' $SCRIPT ' + get_hash_gen_opts +
-                ' -f $SOURCE > $TARGET'
+      command = python_cmd + ' $SCRIPT ' + ' -f $SOURCE > $TARGET'
 )
 
 #
 # Assembly sources
 #
-if env['gcc'] and env['platform'] not in ('cygwin', 'darwin', 'windows', 'haiku'):
+if (env['gcc'] or env['clang']) and \
+   env['platform'] not in ('cygwin', 'darwin', 'windows', 'haiku'):
     if env['machine'] == 'x86':
         env.Append(CPPDEFINES = [
             'USE_X86_ASM',
@@ -421,23 +419,6 @@ if env['gcc'] and env['platform'] not in ('cygwin', 'darwin', 'windows', 'haiku'
         env.Append(CPPPATH = [matypes[0].dir])
 
 
-# The enums.c file is generated from the GL/ES API.xml file
-env.CodeGenerate(
-    target = 'main/enums.c',
-    script = GLAPI + 'gen/gl_enums.py',
-    source = GLAPI + 'gen/gl_and_es_API.xml',
-    command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET'
-    )
-
-# The api_exec.c file is generated from the GL/ES API.xml file
-env.CodeGenerate(
-    target = 'main/api_exec.c',
-    script = GLAPI + 'gen/gl_genexec.py',
-    source = GLAPI + 'gen/gl_and_es_API.xml',
-    command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET'
-    )
-
-
 def write_git_sha1_h_file(filename):
     """Mesa looks for a git_sha1.h file at compile time in order to display
     the current git hash id in the GL_VERSION string.  This function tries