1 files changed, 26 insertions, 6 deletions
diff --git a/src/mesa/main/remap.h b/src/mesa/main/remap.h
index d080188d89f..dda1a6be3a9 100644
--- a/src/mesa/main/remap.h
+++ b/src/mesa/main/remap.h
@@ -28,9 +28,17 @@
 #define REMAP_H
 
 
-#include "main/mtypes.h"
+#include "main/mfeatures.h"
 
-struct gl_function_remap;
+struct gl_function_pool_remap {
+   int pool_index;
+   int remap_index;
+};
+
+struct gl_function_remap {
+   int func_index;
+   int dispatch_offset; /* for sanity check */
+};
 
 
 #if FEATURE_remap_table
@@ -39,9 +47,9 @@ extern int
 driDispatchRemapTable[];
 
 extern const char *
-_mesa_get_function_spec(GLint func_index);
+_mesa_get_function_spec(int func_index);
 
-extern GLint
+extern int
 _mesa_map_function_spec(const char *spec);
 
 extern void
@@ -51,17 +59,22 @@ extern void
 _mesa_map_static_functions(void);
 
 extern void
+_mesa_do_init_remap_table(const char *pool,
+			  int size,
+			  const struct gl_function_pool_remap *remap);
+
+extern void
 _mesa_init_remap_table(void);
 
 #else /* FEATURE_remap_table */
 
 static INLINE const char *
-_mesa_get_function_spec(GLint func_index)
+_mesa_get_function_spec(int func_index)
 {
    return NULL;
 }
 
-static INLINE GLint
+static INLINE int
 _mesa_map_function_spec(const char *spec)
 {
    return -1;
@@ -78,6 +91,13 @@ _mesa_map_static_functions(void)
 }
 
 static INLINE void
+_mesa_do_init_remap_table(const char *pool,
+			  int size,
+			  const struct gl_function_pool_remap *remap)
+{
+}
+
+static INLINE void
 _mesa_init_remap_table(void)
 {
 }