glapi: use gl_and_es_API.xml to generate GLES headers

[mesa.git] / src / mapi / glapi / gen / gl_table.py

diff --git a/src/mapi/glapi/gen/gl_table.py b/src/mapi/glapi/gen/gl_table.py
index c7cb5a40a1c5052c94199dc2d1a3c96f617e6a92..2cbbd971a86570ad73b19f70425a089c7c433c6d 100644 (file)
--- a/src/mapi/glapi/gen/gl_table.py
+++ b/src/mapi/glapi/gen/gl_table.py
@@ -73,7 +73,7 @@ class PrintRemapTable(gl_XML.gl_print_base):
                gl_XML.gl_print_base.__init__(self)
 
                self.es = es
-               self.header_tag = '_GLAPI_DISPATCH_H_'
+               self.header_tag = '_DISPATCH_H_'
                self.name = "gl_table.py (from Mesa)"
                self.license = license.bsd_license_template % ("(C) Copyright IBM Corporation 2005", "IBM")
                return
@@ -81,10 +81,8 @@ class PrintRemapTable(gl_XML.gl_print_base):
 
        def printRealHeader(self):
                print """
-/* this file should not be included directly in mesa */
-
 /**
- * \\file glapidispatch.h
+ * \\file main/dispatch.h
  * Macros for handling GL dispatch tables.
  *
  * For each known GL function, there are 3 macros in this file.  The first
@@ -93,8 +91,9 @@ class PrintRemapTable(gl_XML.gl_print_base):
  * can SET_FuncName, are used to get and set the dispatch pointer for the
  * named function in the specified dispatch table.
  */
+
+#include "main/mfeatures.h"
 """
-               
                return
 
        def printBody(self, api):
@@ -139,19 +138,28 @@ class PrintRemapTable(gl_XML.gl_print_base):
                        print '#define _gloffset_%s %d' % (f.name, f.offset)
 
                print ''
-               print '#if !defined(_GLAPI_USE_REMAP_TABLE)'
+               print '#if !FEATURE_remap_table'
                print ''
 
                for f, index in functions:
                        print '#define _gloffset_%s %d' % (f.name, f.offset)
 
                print ''
-               print '#else /* !_GLAPI_USE_REMAP_TABLE */'
+               print '#else /* !FEATURE_remap_table */'
                print ''
 
-               print '#define driDispatchRemapTable_size %u' % (count)
-               print 'extern int driDispatchRemapTable[ driDispatchRemapTable_size ];'
-               print ''
+               if self.es:
+                       remap_table = "esLocalRemapTable"
+
+                       print '#define %s_size %u' % (remap_table, count)
+                       print 'static int %s[ %s_size ];' % (remap_table, remap_table)
+                       print ''
+               else:
+                       remap_table = "driDispatchRemapTable"
+
+                       print '#define %s_size %u' % (remap_table, count)
+                       print 'extern int %s[ %s_size ];' % (remap_table, remap_table)
+                       print ''
 
                for f, index in functions:
                        print '#define %s_remap_index %u' % (f.name, index)
@@ -159,19 +167,26 @@ class PrintRemapTable(gl_XML.gl_print_base):
                print ''
 
                for f, index in functions:
-                       print '#define _gloffset_%s driDispatchRemapTable[%s_remap_index]' % (f.name, f.name)
+                       print '#define _gloffset_%s %s[%s_remap_index]' % (f.name, remap_table, f.name)
 
                print ''
-               print '#endif /* _GLAPI_USE_REMAP_TABLE */'
+               print '#endif /* !FEATURE_remap_table */'
                print ''
 
                for f, index in abi_functions + functions:
                        arg_string = gl_XML.create_parameter_string( f.parameters, 0 )
-                       cast = '%s (GLAPIENTRYP)(%s)' % (f.return_type, arg_string)
 
-                       print '#define CALL_%s(disp, parameters) CALL_by_offset(disp, (%s), _gloffset_%s, parameters)' % (f.name, cast, f.name)
-                       print '#define GET_%s(disp) GET_by_offset(disp, _gloffset_%s)' % (f.name, f.name)
-                       print '#define SET_%s(disp, fn) SET_by_offset(disp, _gloffset_%s, fn)' % (f.name, f.name)
+                       print 'typedef %s (GLAPIENTRYP _glptr_%s)(%s);' % (f.return_type, f.name, arg_string)
+                       print '#define CALL_%s(disp, parameters) \\' % (f.name)
+                       print '    (* GET_%s(disp)) parameters' % (f.name)
+                       print 'static INLINE _glptr_%s GET_%s(struct _glapi_table *disp) {' % (f.name, f.name)
+                       print '   return (_glptr_%s) (GET_by_offset(disp, _gloffset_%s));' % (f.name, f.name)
+                       print '}'
+                       print
+                       print 'static INLINE void SET_%s(struct _glapi_table *disp, %s (GLAPIENTRYP fn)(%s)) {' % (f.name, f.return_type, arg_string)
+                       print '   SET_by_offset(disp, _gloffset_%s, fn);' % (f.name)
+                       print '}'
+                       print
 
                if alias_functions:
                        print ''
@@ -184,40 +199,40 @@ class PrintRemapTable(gl_XML.gl_print_base):
                                                print '#define SET_%s(disp, fn) SET_%s(disp, fn)' % (name, f.name)
                        print ''
 
-                       print '#if defined(_GLAPI_USE_REMAP_TABLE)'
+                       print '#if FEATURE_remap_table'
                        for f in alias_functions:
                                for name in f.entry_points:
                                        if name != f.name:
                                                print '#define %s_remap_index %s_remap_index' % (name, f.name)
-                       print '#endif /* defined(_GLAPI_USE_REMAP_TABLE) */'
+                       print '#endif /* FEATURE_remap_table */'
                        print ''
 
                return
 
 
 def show_usage():
-       print "Usage: %s [-f input_file_name] [-m mode] [-c]" % sys.argv[0]
+       print "Usage: %s [-f input_file_name] [-m mode] [-c ver]" % sys.argv[0]
        print "    -m mode   Mode can be 'table' or 'remap_table'."
-       print "    -c        Enable compatibility with OpenGL ES."
+       print "    -c ver    Version can be 'es1' or 'es2'."
        sys.exit(1)
 
 if __name__ == '__main__':
        file_name = "gl_API.xml"
     
        try:
-               (args, trail) = getopt.getopt(sys.argv[1:], "f:m:c")
+               (args, trail) = getopt.getopt(sys.argv[1:], "f:m:c:")
        except Exception,e:
                show_usage()
 
        mode = "table"
-       es = False
+       es = None
        for (arg,val) in args:
                if arg == "-f":
                        file_name = val
                elif arg == "-m":
                        mode = val
                elif arg == "-c":
-                       es = True
+                       es = val
 
        if mode == "table":
                printer = PrintGlTable(es)
@@ -228,4 +243,14 @@ if __name__ == '__main__':
 
        api = gl_XML.parse_GL_API( file_name )
 
+       if es is not None:
+               import gles_api
+
+               api_map = {
+                       'es1': gles_api.es1_api,
+                       'es2': gles_api.es2_api,
+               }
+
+               api.filter_functions(api_map[es])
+
        printer.Print( api )