summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorChia-I Wu <[email protected]>2010-10-26 16:16:14 +0800
committerChia-I Wu <[email protected]>2010-11-02 14:17:56 +0800
commitfdede1efaae32d23caf3b351cc766df12e3c5f8d (patch)
tree6ed18ed5ab8fc375b5cc9aed1d5f8d22422b8b79 /src/mesa
parent6b999c89ce1a5bf2d5e8533929b8f2101beaa481 (diff)
mesa: Select FEATURE_remap_table when multiple APIs are enabled.
Core mesa should query glapi for the positions of the functions in _glapi_table when multiple APIs are supported. It does not know which glapitable.h glapi used.
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/dispatch.h4
-rw-r--r--src/mesa/main/es_generator.py2
-rw-r--r--src/mesa/main/mfeatures.h2
3 files changed, 5 insertions, 3 deletions
diff --git a/src/mesa/main/dispatch.h b/src/mesa/main/dispatch.h
index 552384c500c..a597959cf8e 100644
--- a/src/mesa/main/dispatch.h
+++ b/src/mesa/main/dispatch.h
@@ -26,7 +26,9 @@
#ifndef _DISPATCH_H
#define _DISPATCH_H
-#ifdef IN_DRI_DRIVER
+#include "main/mfeatures.h"
+
+#if FEATURE_remap_table
#define _GLAPI_USE_REMAP_TABLE
#endif
diff --git a/src/mesa/main/es_generator.py b/src/mesa/main/es_generator.py
index 8f28da16df8..bd25acd07c9 100644
--- a/src/mesa/main/es_generator.py
+++ b/src/mesa/main/es_generator.py
@@ -212,7 +212,7 @@ extern void _mesa_error(void *ctx, GLenum error, const char *fmtString, ... );
#include "main/remap.h"
/* cannot include main/dispatch.h here */
-#ifdef IN_DRI_DRIVER
+#if FEATURE_remap_table
#define _GLAPI_USE_REMAP_TABLE
#endif
/* glapi uses GLAPIENTRY while GLES headers define GL_APIENTRY */
diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index 5afd65d9766..911b30dda21 100644
--- a/src/mesa/main/mfeatures.h
+++ b/src/mesa/main/mfeatures.h
@@ -78,7 +78,7 @@
#define FEATURE_GL !FEATURE_ES
#endif
-#ifdef IN_DRI_DRIVER
+#if defined(IN_DRI_DRIVER) || (FEATURE_GL + FEATURE_ES1 + FEATURE_ES2 > 1)
#define FEATURE_remap_table 1
#else
#define FEATURE_remap_table 0