diff options
| -rw-r--r-- | src/mapi/glapi/gen/gl_enums.py | 6 | ||||
| -rw-r--r-- | src/mesa/main/compiler.h | 9 |
2 files changed, 13 insertions, 2 deletions
diff --git a/src/mapi/glapi/gen/gl_enums.py b/src/mapi/glapi/gen/gl_enums.py index e1ab6009136..a0c47f41f20 100644 --- a/src/mapi/glapi/gen/gl_enums.py +++ b/src/mapi/glapi/gen/gl_enums.py @@ -47,8 +47,8 @@ class PrintGlEnums(gl_XML.gl_print_base): print '#include "main/imports.h"' print '#include "main/mtypes.h"' print '' - print 'typedef struct {' - print ' size_t offset;' + print 'typedef struct PACKED {' + print ' uint16_t offset;' print ' int n;' print '} enum_elt;' print '' @@ -78,6 +78,8 @@ static char token_tmp[20]; const char *_mesa_lookup_enum_by_nr( int nr ) { + STATIC_ASSERT(sizeof(enum_string_table) < (1 << 16)); + enum_elt *elt = _mesa_bsearch(& nr, enum_string_table_offsets, Elements(enum_string_table_offsets), sizeof(enum_string_table_offsets[0]), diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h index fb7baf84ea4..0f27d5a6643 100644 --- a/src/mesa/main/compiler.h +++ b/src/mesa/main/compiler.h @@ -270,6 +270,15 @@ static INLINE GLuint CPU_TO_LE32(GLuint x) #define NULL 0 #endif +/* Used to optionally mark structures with misaligned elements or size as + * packed, to trade off performance for space. + */ +#if (__GNUC__ >= 3) +#define PACKED __attribute__((__packed__)) +#else +#define PACKED +#endif + /** * LONGSTRING macro |