Merge remote branch 'origin/nvc0'

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

diff --git a/src/mesa/main/remap.h b/src/mesa/main/remap.h
index d080188d89fd97bd148ac010630b350439316d09..5fee300529058bda52d7a63bdae086393316124c 100644 (file)
--- a/src/mesa/main/remap.h
+++ b/src/mesa/main/remap.h
@@ -28,9 +28,18 @@
 #define REMAP_H
 
 
-#include "main/mtypes.h"
+#include "main/compiler.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 +48,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
@@ -56,12 +65,12 @@ _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;
@@ -77,6 +86,7 @@ _mesa_map_static_functions(void)
 {
 }
 
+
 static INLINE void
 _mesa_init_remap_table(void)
 {