summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChia-I Wu <olv@lunarg.com>2010-08-21 18:20:39 +0800
committerChia-I Wu <olv@lunarg.com>2010-08-23 18:28:14 +0800
commit0c878280506767c38887b71b45af2cb64a0f4abd (patch)
tree7e9a873b1c32ab758128b2ab7a1c277a3c4fe2bd /src
parent8a537b2fb856d27f49235d9f5684901f1213214c (diff)
mesa: Assorted fixes for es_generator.py on win32.
Fix mixed use of GL_APIENTRY and GLAPIENTRY. Parameter list of a function prototype should never be empty.
Diffstat (limited to 'src')
-rw-r--r--src/mesa/main/es_generator.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/mesa/main/es_generator.py b/src/mesa/main/es_generator.py
index c1fe2401c4..ecb34bb5cd 100644
--- a/src/mesa/main/es_generator.py
+++ b/src/mesa/main/es_generator.py
@@ -215,6 +215,10 @@ extern void _mesa_error(void *ctx, GLenum error, const char *fmtString, ... );
#ifdef IN_DRI_DRIVER
#define _GLAPI_USE_REMAP_TABLE
#endif
+/* glapi uses GLAPIENTRY while GLES headers define GL_APIENTRY */
+#ifndef GLAPIENTRY
+#define GLAPIENTRY GL_APIENTRY
+#endif
#include "%sapi/glapi/glapitable.h"
#include "%sapi/glapi/glapioffsets.h"
#include "%sapi/glapi/glapidispatch.h"
@@ -603,6 +607,8 @@ for funcName in keys:
# are complete; remove the extra ", " at the front of each.
passthroughDeclarationString = passthroughDeclarationString[2:]
passthroughCallString = passthroughCallString[2:]
+ if not passthroughDeclarationString:
+ passthroughDeclarationString = "void"
# The Mesa functions are scattered across all the Mesa
# header files. The easiest way to manage declarations