aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main/es_generator.py
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-06-09 09:24:20 +0200
committermarha <marha@users.sourceforge.net>2011-06-09 09:24:20 +0200
commit0a9d2abef2e6fac5d52556969655a62711df6418 (patch)
tree86d46767bedf8271ec0f67442259c5b3e7a8bb87 /mesalib/src/mesa/main/es_generator.py
parentadeb8256da9b636648178f729d7b3316a0a8e990 (diff)
downloadvcxsrv-0a9d2abef2e6fac5d52556969655a62711df6418.tar.gz
vcxsrv-0a9d2abef2e6fac5d52556969655a62711df6418.tar.bz2
vcxsrv-0a9d2abef2e6fac5d52556969655a62711df6418.zip
mesa xkbcomp xkeyboard-config git update 9 Jun 2011
Diffstat (limited to 'mesalib/src/mesa/main/es_generator.py')
-rw-r--r--mesalib/src/mesa/main/es_generator.py12
1 files changed, 5 insertions, 7 deletions
diff --git a/mesalib/src/mesa/main/es_generator.py b/mesalib/src/mesa/main/es_generator.py
index 87d8bd316..c0b0a4458 100644
--- a/mesalib/src/mesa/main/es_generator.py
+++ b/mesalib/src/mesa/main/es_generator.py
@@ -680,9 +680,8 @@ print """
#if FEATURE_remap_table
-/* cannot include main/dispatch.h here */
-#define _GLAPI_USE_REMAP_TABLE
-#include "%sapi/main/glapidispatch.h"
+/* define esLocalRemapTable */
+#include "%sapi/main/dispatch.h"
#define need_MESA_remap_table
#include "%sapi/main/remap_helper.h"
@@ -701,7 +700,7 @@ init_remap_table(void)
return;
}
- for (i = 0; i < driDispatchRemapTable_size; i++) {
+ for (i = 0; i < esLocalRemapTable_size; i++) {
GLint offset;
const char *spec;
@@ -710,7 +709,7 @@ init_remap_table(void)
spec = _mesa_function_pool + remap[i].pool_index;
offset = _mesa_map_function_spec(spec);
- remap_table[i] = offset;
+ esLocalRemapTable[i] = offset;
}
initialized = GL_TRUE;
_glthread_UNLOCK_MUTEX(mutex);
@@ -718,8 +717,7 @@ init_remap_table(void)
#else /* FEATURE_remap_table */
-/* cannot include main/dispatch.h here */
-#include "%sapi/main/glapidispatch.h"
+#include "%sapi/main/dispatch.h"
static INLINE void
init_remap_table(void)