summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2010-05-02 16:10:40 +0100
committerJosé Fonseca <jfonseca@vmware.com>2010-05-02 16:10:40 +0100
commit559d124ed3f2070c73c5cb9c3b506ddd9cfaeb02 (patch)
tree505da758c1394028cad2889f453a5a58b3b4ed81 /src/mesa
parent316b6fa50936470ee4f3c14d982ec216ec352ea1 (diff)
mesa: #ifdef out more remap_table related code when disabled.
Seems to get everything building again here.
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/api_exec.c4
-rw-r--r--src/mesa/main/remap.c5
2 files changed, 6 insertions, 3 deletions
diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index 7b6ac63fac..f838561aef 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -107,6 +107,8 @@
#endif
#include "main/dispatch.h"
+#ifdef _GLAPI_USE_REMAP_TABLE
+
#define need_MESA_remap_table
#include "main/remap.h"
#include "main/remap_helper.h"
@@ -142,6 +144,8 @@ _mesa_init_remap_table(void)
MESA_remap_table_functions);
}
+#endif /* _GLAPI_USE_REMAP_TABLE */
+
/**
* Initialize a dispatch table with pointers to Mesa's immediate-mode
diff --git a/src/mesa/main/remap.c b/src/mesa/main/remap.c
index 38ddc0c1dd..2b0d054bf2 100644
--- a/src/mesa/main/remap.c
+++ b/src/mesa/main/remap.c
@@ -36,13 +36,12 @@
* a dynamic entry, or the corresponding static entry, in glapi.
*/
+#if FEATURE_remap_table
+
#include "remap.h"
#include "imports.h"
#include "glapi/glapi.h"
-#if FEATURE_remap_table
-
-
#define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0]))
#define MAX_ENTRY_POINTS 16