summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2010-05-02 16:10:40 +0100
committerKristian Høgsberg <krh@bitplanet.net>2010-05-03 12:22:28 -0400
commita5fca974cfba4065a6383ff9ea4693b2960c6e68 (patch)
tree68292b25562ce8b8fe077dc7c5a7ec6102f5e93f
parent269f4168648aa0324c8b249475329cd5e38dfc2a (diff)
mesa: #ifdef out more remap_table related code when disabled.
Seems to get everything building again here.
-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 93733d5b8c..b8acb3effe 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -106,6 +106,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"
@@ -141,6 +143,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 e03a5d2e0f..5dc13c2900 100644
--- a/src/mesa/main/remap.c
+++ b/src/mesa/main/remap.c
@@ -35,13 +35,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