mesa: fix GLES remap table setup again

Generate different glapidispatch.h's for GL and GLES.  For GLES, we want
a local remap table.

This reverts commit 5af46e836073d2112b147b524e441bdb808cc128.  The
commit will break GL remap table setup when main/glapidispatch.h is
regenerated.

1 files changed, 3 insertions, 2 deletions

diff --git a/src/mesa/main/es_generator.py b/src/mesa/main/es_generator.py
index 87d8bd31682..5b49416782d 100644
--- a/src/mesa/main/es_generator.py
+++ b/src/mesa/main/es_generator.py
@@ -680,6 +680,7 @@ print """
 
 #if FEATURE_remap_table
 
+/* define esLocalRemapTable */
 /* cannot include main/dispatch.h here */
 #define _GLAPI_USE_REMAP_TABLE
 #include "%sapi/main/glapidispatch.h"
@@ -701,7 +702,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 +711,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);