[Mesa-dev] [PATCH 11/12] mesa: Use a 32-bit offset for the enums.c string offset table.

Eric Anholt eric at anholt.net
Wed Nov 25 19:10:54 PST 2015


With GLES 3.1, GL 4.5, and many new vendor extensions about to get their
enums added, we jump up to 85k of table.
---
 src/mapi/glapi/gen/gl_enums.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/mapi/glapi/gen/gl_enums.py b/src/mapi/glapi/gen/gl_enums.py
index d37eb5c..05125f5 100644
--- a/src/mapi/glapi/gen/gl_enums.py
+++ b/src/mapi/glapi/gen/gl_enums.py
@@ -55,7 +55,7 @@ class PrintGlEnums(gl_XML.gl_print_base):
         print '#include "main/mtypes.h"'
         print ''
         print 'typedef struct PACKED {'
-        print '   uint16_t offset;'
+        print '   uint32_t offset;'
         print '   int n;'
         print '} enum_elt;'
         print ''
@@ -87,8 +87,6 @@ const char *_mesa_enum_to_string( int nr )
 {
    enum_elt *elt;
 
-   STATIC_ASSERT(sizeof(enum_string_table) < (1 << 16));
-
    elt = bsearch(& nr, enum_string_table_offsets,
                  ARRAY_SIZE(enum_string_table_offsets),
                  sizeof(enum_string_table_offsets[0]),
-- 
2.6.2



More information about the mesa-dev mailing list