summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Sapountzis <gsapountzis@gmail.com>2010-03-02 03:31:16 +0200
committerGeorge Sapountzis <gsapountzis@gmail.com>2010-03-02 03:32:43 +0200
commitd3f24ab33c284325abaf4b250f8928d4d53836e1 (patch)
tree41a8d5666b9bd7ddc64a2c67bfb8444b8f4167d3
parent6e48f17a1620dda83e0fedd68a8f004ed1fbfea9 (diff)
glapi: fix compile with ES
-rw-r--r--src/mesa/glapi/glapi.c6
-rw-r--r--src/mesa/glapi/glapi_getproc.c4
2 files changed, 9 insertions, 1 deletions
diff --git a/src/mesa/glapi/glapi.c b/src/mesa/glapi/glapi.c
index fcb30895aa..13de594aaf 100644
--- a/src/mesa/glapi/glapi.c
+++ b/src/mesa/glapi/glapi.c
@@ -256,7 +256,7 @@ _glapi_set_dispatch(struct _glapi_table *dispatch)
/* use the no-op functions */
dispatch = (struct _glapi_table *) __glapi_noop_table;
}
-#if 0 /* enable this for extra DEBUG */
+#ifdef DEBUG
else {
_glapi_check_table_not_null(dispatch);
_glapi_check_table(dispatch);
@@ -322,10 +322,14 @@ _glapi_get_dispatch_table_size(void)
void
_glapi_check_table_not_null(const struct _glapi_table *table)
{
+#if 0 /* enable this for extra DEBUG */
const GLuint entries = _glapi_get_dispatch_table_size();
const void **tab = (const void **) table;
GLuint i;
for (i = 1; i < entries; i++) {
assert(tab[i]);
}
+#else
+ (void) table;
+#endif
}
diff --git a/src/mesa/glapi/glapi_getproc.c b/src/mesa/glapi/glapi_getproc.c
index 5be6d65b56..a6dbf173e8 100644
--- a/src/mesa/glapi/glapi_getproc.c
+++ b/src/mesa/glapi/glapi_getproc.c
@@ -773,6 +773,7 @@ _glapi_get_proc_name(GLuint offset)
void
_glapi_check_table(const struct _glapi_table *table)
{
+#if 0 /* enable this for extra DEBUG */
{
GLuint BeginOffset = _glapi_get_proc_offset("glBegin");
char *BeginFunc = (char*) &table->Begin;
@@ -829,4 +830,7 @@ _glapi_check_table(const struct _glapi_table *table)
assert(setFenceOffset == _gloffset_SetFenceNV);
assert(setFenceOffset == offset);
}
+#else
+ (void) table;
+#endif
}