aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mesalib/src/mapi/glapi/gen/gl_table.py5
-rw-r--r--mesalib/src/mesa/main/es_generator.py4
-rw-r--r--mesalib/src/mesa/main/formats.c4
-rw-r--r--mesalib/src/mesa/main/formats.h2
-rw-r--r--xorg-server/glx/dispatch.h5
-rw-r--r--xorg-server/hw/xfree86/common/xf86Module.h2
6 files changed, 15 insertions, 7 deletions
diff --git a/mesalib/src/mapi/glapi/gen/gl_table.py b/mesalib/src/mapi/glapi/gen/gl_table.py
index a1a9186a4..f54d7a491 100644
--- a/mesalib/src/mapi/glapi/gen/gl_table.py
+++ b/mesalib/src/mapi/glapi/gen/gl_table.py
@@ -155,6 +155,11 @@ class PrintRemapTable(gl_XML.gl_print_base):
print '#define driDispatchRemapTable_size %u' % (count)
print 'extern int driDispatchRemapTable[ driDispatchRemapTable_size ];'
print ''
+ print '#if FEATURE_remap_table'
+ print '#define driDispatchRemapTable remap_table'
+ print 'static int remap_table[driDispatchRemapTable_size];'
+ print '#endif'
+ print ''
for f, index in functions:
print '#define %s_remap_index %u' % (f.name, index)
diff --git a/mesalib/src/mesa/main/es_generator.py b/mesalib/src/mesa/main/es_generator.py
index 0776cf9a6..0e0d436fc 100644
--- a/mesalib/src/mesa/main/es_generator.py
+++ b/mesalib/src/mesa/main/es_generator.py
@@ -687,10 +687,6 @@ print """
#define need_MESA_remap_table
#include "%sapi/main/remap_helper.h"
-/* force SET_* macros to use the local remap table */
-#define driDispatchRemapTable remap_table
-static int remap_table[driDispatchRemapTable_size];
-
static void
init_remap_table(void)
{
diff --git a/mesalib/src/mesa/main/formats.c b/mesalib/src/mesa/main/formats.c
index f0f30fe0a..b6210be61 100644
--- a/mesalib/src/mesa/main/formats.c
+++ b/mesalib/src/mesa/main/formats.c
@@ -1118,8 +1118,10 @@ _mesa_get_format_name(gl_format format)
* Return bytes needed to store a block of pixels in the given format.
* Normally, a block is 1x1 (a single pixel). But for compressed formats
* a block may be 4x4 or 8x4, etc.
+ *
+ * Note: not GLuint, so as not to coerce math to unsigned. cf. fdo #37351
*/
-GLuint
+GLint
_mesa_get_format_bytes(gl_format format)
{
const struct gl_format_info *info = _mesa_get_format_info(format);
diff --git a/mesalib/src/mesa/main/formats.h b/mesalib/src/mesa/main/formats.h
index c9fd0baab..22488553e 100644
--- a/mesalib/src/mesa/main/formats.h
+++ b/mesalib/src/mesa/main/formats.h
@@ -216,7 +216,7 @@ typedef enum
extern const char *
_mesa_get_format_name(gl_format format);
-extern GLuint
+extern GLint
_mesa_get_format_bytes(gl_format format);
extern GLint
diff --git a/xorg-server/glx/dispatch.h b/xorg-server/glx/dispatch.h
index 3a9635b9f..f572c6770 100644
--- a/xorg-server/glx/dispatch.h
+++ b/xorg-server/glx/dispatch.h
@@ -1000,6 +1000,11 @@
#define driDispatchRemapTable_size 520
extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
+#if FEATURE_remap_table
+#define driDispatchRemapTable remap_table
+static int remap_table[driDispatchRemapTable_size];
+#endif
+
#define AttachShader_remap_index 0
#define CreateProgram_remap_index 1
#define CreateShader_remap_index 2
diff --git a/xorg-server/hw/xfree86/common/xf86Module.h b/xorg-server/hw/xfree86/common/xf86Module.h
index 1322b8046..02fdab608 100644
--- a/xorg-server/hw/xfree86/common/xf86Module.h
+++ b/xorg-server/hw/xfree86/common/xf86Module.h
@@ -82,7 +82,7 @@ typedef enum {
* mask is 0xFFFF0000.
*/
#define ABI_ANSIC_VERSION SET_ABI_VERSION(0, 4)
-#define ABI_VIDEODRV_VERSION SET_ABI_VERSION(10, 0)
+#define ABI_VIDEODRV_VERSION SET_ABI_VERSION(11, 0)
#define ABI_XINPUT_VERSION SET_ABI_VERSION(12, 2)
#define ABI_EXTENSION_VERSION SET_ABI_VERSION(5, 0)
#define ABI_FONT_VERSION SET_ABI_VERSION(0, 6)