Mesa (master): mesa: Assorted fixes for es_generator.py on win32.
Chia-I Wu
olv at kemper.freedesktop.org
Mon Aug 23 10:29:16 UTC 2010
Module: Mesa
Branch: master
Commit: 0c878280506767c38887b71b45af2cb64a0f4abd
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0c878280506767c38887b71b45af2cb64a0f4abd
Author: Chia-I Wu <olv at lunarg.com>
Date: Sat Aug 21 18:20:39 2010 +0800
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.
---
src/mesa/main/es_generator.py | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/mesa/main/es_generator.py b/src/mesa/main/es_generator.py
index c1fe240..ecb34bb 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
More information about the mesa-commit
mailing list