mesa: fix some minor texstore comments

[mesa.git] / src / mesa / main / remap.c

diff --git a/src/mesa/main/remap.c b/src/mesa/main/remap.c
index bfceb43c974155d092812e7a51a4337a369b14c8..c89fba453023ecad854b78d226f6f089272d97e1 100644 (file)
--- a/src/mesa/main/remap.c
+++ b/src/mesa/main/remap.c
@@ -36,21 +36,19 @@
  * a dynamic entry, or the corresponding static entry, in glapi.
  */
 
-#include "remap.h"
-#include "imports.h"
-
-#include "main/dispatch.h"
-
+#include "mfeatures.h"
 
 #if FEATURE_remap_table
 
+#include "remap.h"
+#include "imports.h"
+#include "glapi/glapi.h"
+
+#define MAX_ENTRY_POINTS 16
 
 #define need_MESA_remap_table
 #include "main/remap_helper.h"
 
-#define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0]))
-#define MAX_ENTRY_POINTS 16
-
 
 /* this is global for quick access */
 int driDispatchRemapTable[driDispatchRemapTable_size];
@@ -67,7 +65,7 @@ int driDispatchRemapTable[driDispatchRemapTable_size];
 const char *
 _mesa_get_function_spec(GLint func_index)
 {
-   if (func_index < ARRAY_SIZE(_mesa_function_pool))
+   if (func_index < Elements(_mesa_function_pool))
       return _mesa_function_pool + func_index;
    else
       return NULL;
@@ -186,8 +184,10 @@ _mesa_map_static_functions(void)
  * The remap table needs to be initialized before calling the
  * CALL/GET/SET macros defined in main/dispatch.h.
  */
-void
-_mesa_init_remap_table(void)
+static void
+_mesa_do_init_remap_table(const char *pool,
+                         int size,
+                         const struct gl_function_pool_remap *remap)
 {
    static GLboolean initialized = GL_FALSE;
    GLint i;
@@ -197,13 +197,13 @@ _mesa_init_remap_table(void)
    initialized = GL_TRUE;
 
    /* initialize the remap table */
-   for (i = 0; i < ARRAY_SIZE(driDispatchRemapTable); i++) {
+   for (i = 0; i < size; i++) {
       GLint offset;
       const char *spec;
 
       /* sanity check */
-      ASSERT(i == MESA_remap_table_functions[i].remap_index);
-      spec = _mesa_function_pool + MESA_remap_table_functions[i].pool_index;
+      ASSERT(i == remap[i].remap_index);
+      spec = _mesa_function_pool + remap[i].pool_index;
 
       offset = _mesa_map_function_spec(spec);
       /* store the dispatch offset in the remap table */
@@ -214,4 +214,13 @@ _mesa_init_remap_table(void)
 }
 
 
+void
+_mesa_init_remap_table(void)
+{
+   _mesa_do_init_remap_table(_mesa_function_pool,
+                            driDispatchRemapTable_size,
+                            MESA_remap_table_functions);
+}
+
+
 #endif /* FEATURE_remap_table */