diff options
| author | marha <marha@users.sourceforge.net> | 2011-05-24 06:33:14 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-05-24 06:33:14 +0000 |
| commit | 941e7f505285f0b77f232f700561c752ce75ff97 (patch) | |
| tree | 298cb649d97a46ea97835411ef517857f1dc70db /mesalib/src | |
| parent | 98a78a31883c4b5d63dd1465b4208bcc7c12bfcb (diff) | |
| parent | 94d512f7295ade7b381fba2e9e0bc0c434cf8b65 (diff) | |
| download | vcxsrv-941e7f505285f0b77f232f700561c752ce75ff97.tar.gz vcxsrv-941e7f505285f0b77f232f700561c752ce75ff97.tar.bz2 vcxsrv-941e7f505285f0b77f232f700561c752ce75ff97.zip | |
merge ^/branches/released .
Diffstat (limited to 'mesalib/src')
| -rw-r--r-- | mesalib/src/mapi/glapi/gen/gl_table.py | 5 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/es_generator.py | 4 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/formats.c | 4 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/formats.h | 2 |
4 files changed, 9 insertions, 6 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
|