Mesa (master): gl_table.py: always regenerate the complete struct _glapi_table

Emil Velikov evelikov at kemper.freedesktop.org
Thu May 4 17:23:12 UTC 2017


Module: Mesa
Branch: master
Commit: edb7165b25aa4f9be445988f524f54dc630dbcbe
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=edb7165b25aa4f9be445988f524f54dc630dbcbe

Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Thu Apr 13 17:50:10 2017 +0100

gl_table.py: always regenerate the complete struct _glapi_table

Currently we would generate a partial one as we do non-shared glapi.
At the same time since it's local, we don't care that much if we have a
few extra bytes of space in the table.

Drop the guard, which allows us to simplify both build system and code.

Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>

---

 src/mapi/glapi/gen/gl_table.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/mapi/glapi/gen/gl_table.py b/src/mapi/glapi/gen/gl_table.py
index 43c9135d2d..80a44f4848 100644
--- a/src/mapi/glapi/gen/gl_table.py
+++ b/src/mapi/glapi/gen/gl_table.py
@@ -40,20 +40,14 @@ class PrintGlTable(gl_XML.gl_print_base):
         self.license = license.bsd_license_template % ( \
 """Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
 (C) Copyright IBM Corporation 2004""", "BRIAN PAUL, IBM")
-        self.ifdef_emitted = False
         return
 
     def printBody(self, api):
         for f in api.functionIterateByOffset():
-            if not f.is_abi() and not self.ifdef_emitted:
-                print '#if !defined HAVE_SHARED_GLAPI'
-                self.ifdef_emitted = True
             arg_string = f.get_parameter_string()
             print '   %s (GLAPIENTRYP %s)(%s); /* %d */' % (
                 f.return_type, f.name, arg_string, f.offset)
 
-        print '#endif /* !defined HAVE_SHARED_GLAPI */'
-
     def printRealHeader(self):
         print '#ifndef GLAPIENTRYP'
         print '# ifndef GLAPIENTRY'




More information about the mesa-commit mailing list