From: Eric Anholt <eric@anholt.net>
Date: Sat, 19 Sep 2015 16:57:22 +0000 (-0400)
Subject: mesa: Use a 32-bit offset for the enums.c string offset table.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b65e44f55d531ff8ceaec8861f02a2c3c7a01297;p=mesa.git

mesa: Use a 32-bit offset for the enums.c string offset table.

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.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
---

diff --git a/src/mapi/glapi/gen/gl_enums.py b/src/mapi/glapi/gen/gl_enums.py
index d37eb5c74a1..05125f568ea 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]),