[Mesa-dev] [PATCH v2 15/24] mapi/new: remove duplicate GLvoid/void substitution

Emil Velikov emil.l.velikov at gmail.com
Fri Dec 14 14:04:56 UTC 2018


From: Emil Velikov <emil.velikov at collabora.com>

We already do it a few lines above - drop the duplicate.

Note that for consistency sake, we keep the substitution since the GL
API is a mixed bad - some use GLvoid while others a normal void.

We might want to merge this back in GLVND.

Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
---
 src/mapi/new/genCommon.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/mapi/new/genCommon.py b/src/mapi/new/genCommon.py
index f4eb1728e95..a9fdbcdc9ee 100644
--- a/src/mapi/new/genCommon.py
+++ b/src/mapi/new/genCommon.py
@@ -226,7 +226,6 @@ def _fixupTypeName(typeName):
     # Remove the vendor suffixes from types that have a suffix-less version.
     rv = re.sub(r"\b(GLhalf|GLintptr|GLsizeiptr|GLint64|GLuint64)(?:ARB|EXT|NV|ATI)\b", r"\1", rv)
 
-    rv = re.sub(r"\bGLvoid\b", "void", rv)
     rv = re.sub(r"\bGLDEBUGPROCKHR\b", "GLDEBUGPROC", rv)
 
     # Clear out any leading and trailing whitespace.
-- 
2.19.2



More information about the mesa-dev mailing list