From: Emil Velikov <emil.velikov@collabora.com>
Date: Tue, 20 Nov 2018 16:43:41 +0000 (+0000)
Subject: mapi/new: remove duplicate GLvoid/void substitution
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=389bc2bc6e6410b1b4fc1c470a5c2fce871f7b63;p=mesa.git

mapi/new: remove duplicate GLvoid/void substitution

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@collabora.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
---

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.