From: Chia-I Wu <olv@lunarg.com>
Date: Sat, 21 Aug 2010 10:20:39 +0000 (+0800)
Subject: mesa: Assorted fixes for es_generator.py on win32.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0c878280506767c38887b71b45af2cb64a0f4abd;p=mesa.git

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.
---

diff --git a/src/mesa/main/es_generator.py b/src/mesa/main/es_generator.py
index c1fe2401c4a..ecb34bb5cdf 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