diff options
| author | Chia-I Wu <[email protected]> | 2009-10-20 14:32:39 +0800 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2009-11-05 20:04:10 -0700 |
| commit | 6418f836d470b41c2a5dbfad52b797db1ec3871b (patch) | |
| tree | 2165d6a4ad629a5a604c79d856639796c685381d | |
| parent | 8d2edbf1395ca1e2d23b3bd2ba2c5d54f21d377b (diff) | |
glapi: Add is_abi() to test if a function is in the ABI.
The test is done by checking if the offset is manually assigned. The
generated headers are unchanged.
Signed-off-by: Chia-I Wu <[email protected]>
| -rw-r--r-- | src/mesa/glapi/gl_XML.py | 3 | ||||
| -rw-r--r-- | src/mesa/glapi/gl_offsets.py | 5 | ||||
| -rw-r--r-- | src/mesa/glapi/gl_table.py | 5 | ||||
| -rw-r--r-- | src/mesa/glapi/remap_helper.py | 2 |
4 files changed, 6 insertions, 9 deletions
diff --git a/src/mesa/glapi/gl_XML.py b/src/mesa/glapi/gl_XML.py index b98919134fb..bafb00306f8 100644 --- a/src/mesa/glapi/gl_XML.py +++ b/src/mesa/glapi/gl_XML.py @@ -738,6 +738,9 @@ class gl_function( gl_item ): return p_string + def is_abi(self): + return (self.offset >= 0 and not self.assign_offset) + def is_static_entry_point(self, name): return name in self.static_entry_points diff --git a/src/mesa/glapi/gl_offsets.py b/src/mesa/glapi/gl_offsets.py index ca6c90ffd8e..b8b509d09fa 100644 --- a/src/mesa/glapi/gl_offsets.py +++ b/src/mesa/glapi/gl_offsets.py @@ -41,8 +41,6 @@ class PrintGlOffsets(gl_XML.gl_print_base): return def printBody(self, api): - abi = [ "1.0", "1.1", "1.2", "GL_ARB_multitexture" ] - print '/* this file should not be included directly in mesa */' print '' @@ -50,8 +48,7 @@ class PrintGlOffsets(gl_XML.gl_print_base): abi_functions = [] count = 0 for f in api.functionIterateByOffset(): - [category, num] = api.get_category_for_name( f.name ) - if category not in abi: + if not f.is_abi(): functions.append( [f, count] ) count += 1 else: diff --git a/src/mesa/glapi/gl_table.py b/src/mesa/glapi/gl_table.py index 0e05b3431a1..698795fb0ab 100644 --- a/src/mesa/glapi/gl_table.py +++ b/src/mesa/glapi/gl_table.py @@ -113,14 +113,11 @@ class PrintRemapTable(gl_XML.gl_print_base): print ' } while(0)' print '' - abi = [ "1.0", "1.1", "1.2", "GL_ARB_multitexture" ] - functions = [] abi_functions = [] count = 0 for f in api.functionIterateByOffset(): - [category, num] = api.get_category_for_name( f.name ) - if category not in abi: + if not f.is_abi(): functions.append( [f, count] ) count += 1 else: diff --git a/src/mesa/glapi/remap_helper.py b/src/mesa/glapi/remap_helper.py index e47583a5d3f..2a1f5adc32a 100644 --- a/src/mesa/glapi/remap_helper.py +++ b/src/mesa/glapi/remap_helper.py @@ -145,7 +145,7 @@ class PrintGlRemap(gl_XML.gl_print_base): funcs = [] for f in extension_functions[ext]: # test if the function is in the ABI - if not f.assign_offset and f.offset >= 0: + if f.is_abi(): funcs.append(f) if not funcs: continue |