aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mapi
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-09-20 10:51:44 +0200
committermarha <marha@users.sourceforge.net>2011-09-20 10:51:44 +0200
commit5921af43b0a9b04c0c6b7d3c1e042e05bd3acbb1 (patch)
treeb7206e85fd135f1cf45c1db3ad85d3dc7c2fa2d3 /mesalib/src/mapi
parent97f357506241a5314de9071befcd01be731f1dbb (diff)
parent0470a59df89ab453bdbe0fc2f820278cfffdc61c (diff)
downloadvcxsrv-5921af43b0a9b04c0c6b7d3c1e042e05bd3acbb1.tar.gz
vcxsrv-5921af43b0a9b04c0c6b7d3c1e042e05bd3acbb1.tar.bz2
vcxsrv-5921af43b0a9b04c0c6b7d3c1e042e05bd3acbb1.zip
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mapi')
-rw-r--r--mesalib/src/mapi/glapi/gen/remap_helper.py43
1 files changed, 5 insertions, 38 deletions
diff --git a/mesalib/src/mapi/glapi/gen/remap_helper.py b/mesalib/src/mapi/glapi/gen/remap_helper.py
index 367ae24c7..0008634ff 100644
--- a/mesalib/src/mapi/glapi/gen/remap_helper.py
+++ b/mesalib/src/mapi/glapi/gen/remap_helper.py
@@ -74,7 +74,11 @@ class PrintGlRemap(gl_XML.gl_print_base):
pool_indices = {}
print '/* this is internal to remap.c */'
- print '#ifdef need_MESA_remap_table'
+ print '#ifndef need_MESA_remap_table'
+ print '#error Only remap.c should include this file!'
+ print '#endif /* need_MESA_remap_table */'
+ print ''
+
print ''
print 'static const char _mesa_function_pool[] ='
@@ -156,43 +160,6 @@ class PrintGlRemap(gl_XML.gl_print_base):
print ' { -1, -1 }'
print '};'
print ''
-
- print '#endif /* need_MESA_remap_table */'
- print ''
-
- # output remap helpers for DRI drivers
-
- for ext in extensions:
- funcs = []
- remapped = []
- for f in extension_functions[ext]:
- if f.assign_offset:
- # these are handled above
- remapped.append(f)
- else:
- # these functions are either in the
- # abi, or have offset -1
- funcs.append(f)
-
- print '#if defined(need_%s)' % (ext)
- if remapped:
- print '/* functions defined in MESA_remap_table_functions are excluded */'
-
- # output extension functions that need to be mapped
- print 'static const struct gl_function_remap %s_functions[] = {' % (ext)
- for f in funcs:
- if f.offset >= 0:
- print ' { %5d, _gloffset_%s },' \
- % (pool_indices[f], f.name)
- else:
- print ' { %5d, -1 }, /* %s */' % \
- (pool_indices[f], f.name)
- print ' { -1, -1 }'
- print '};'
-
- print '#endif'
- print ''
-
return