PySide6: Remove GL entities in QtOpenGL

After change 50d0c3c94ff66c104de269f09c08109eb9d0eb3a, shiboken now
also matches unresolved signatures. It is then no longer required to
exactly resolve the GL typedefs.

Remove the entities used for this. Some signatures needed fixing as
well.

This fixes some platform-specific warnings about unmatched signatures
for modifications.

Change-Id: Iee9fbaef1a0142956942bc9431db38166fd6fa1d
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>

7 files changed, 20 insertions, 40 deletions

diff --git a/sources/pyside6/PySide6/QtOpenGL/typesystem_glgeti_v_modifications.xml b/sources/pyside6/PySide6/QtOpenGL/typesystem_glgeti_v_modifications.xml
index 155ac76f4..f0e6084cf 100644
--- a/sources/pyside6/PySide6/QtOpenGL/typesystem_glgeti_v_modifications.xml
+++ b/sources/pyside6/PySide6/QtOpenGL/typesystem_glgeti_v_modifications.xml
@@ -1,4 +1,4 @@
-<modify-function signature="glGetBooleani_v(&GLuint;,&GLuint;,&GLboolean;*)">
+<modify-function signature="glGetBooleani_v(GLenum,GLuint,GLboolean*)">
     <modify-argument index="return" pyi-type="Union[bool,numpy.ndarray]">
         <replace-type modified-type="PyObject"/>
     </modify-argument>
@@ -7,7 +7,7 @@
     </modify-argument>
     <inject-code class="target" position="beginning" file="../glue/qtgui.cpp" snippet="qopenglextrafunctions-glgetbooleani-v"/>
 </modify-function>
-<modify-function signature="glGetIntegeri_v(&GLuint;,&GLuint;,&GLint;*)">
+<modify-function signature="glGetIntegeri_v(GLenum,GLuint,GLint*)">
     <modify-argument index="return" pyi-type="Union[int,numpy.ndarray]">
         <replace-type modified-type="PyObject"/>
     </modify-argument>
diff --git a/sources/pyside6/PySide6/QtOpenGL/typesystem_glgetv_modifications.xml b/sources/pyside6/PySide6/QtOpenGL/typesystem_glgetv_modifications.xml
index cb113d0ce..b5fab57ba 100644
--- a/sources/pyside6/PySide6/QtOpenGL/typesystem_glgetv_modifications.xml
+++ b/sources/pyside6/PySide6/QtOpenGL/typesystem_glgetv_modifications.xml
@@ -1,4 +1,4 @@
-<modify-function signature="glGetBooleanv(&GLuint;,&GLboolean;*)">
+<modify-function signature="glGetBooleanv(GLenum,GLboolean*)">
     <modify-argument index="return" pyi-type="Union[bool,numpy.ndarray]">
         <replace-type modified-type="PyObject"/>
     </modify-argument>
@@ -7,7 +7,7 @@
     </modify-argument>
     <inject-code class="target" position="beginning" file="../glue/qtgui.cpp" snippet="qopenglfunctions-glgetbooleanv"/>
 </modify-function>
-<modify-function signature="glGetDoublev(&GLuint;,double*)">
+<modify-function signature="glGetDoublev(GLenum,GLdouble*)">
     <modify-argument index="return" pyi-type="Union[float,numpy.ndarray]">
         <replace-type modified-type="PyObject"/>
     </modify-argument>
@@ -16,7 +16,7 @@
     </modify-argument>
     <inject-code class="target" position="beginning" file="../glue/qtgui.cpp" snippet="qopenglfunctions-glgetdoublev"/>
 </modify-function>
-<modify-function signature="glGetFloatv(&GLuint;,float*)">
+<modify-function signature="glGetFloatv(GLenum,GLfloat*)">
     <modify-argument index="return" pyi-type="Union[float,numpy.ndarray]">
         <replace-type modified-type="PyObject"/>
     </modify-argument>
@@ -25,7 +25,7 @@
     </modify-argument>
     <inject-code class="target" position="beginning" file="../glue/qtgui.cpp" snippet="qopenglfunctions-glgetfloatv"/>
 </modify-function>
-<modify-function signature="glGetIntegerv(&GLuint;,&GLint;*)">
+<modify-function signature="glGetIntegerv(GLenum,GLint*)">
     <modify-argument index="return" pyi-type="Union[int,numpy.ndarray]">
         <replace-type modified-type="PyObject"/>
     </modify-argument>
diff --git a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl.xml b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl.xml
index c879e1ee1..166f81765 100644
--- a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl.xml
+++ b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl.xml
@@ -8,26 +8,6 @@
   <load-typesystem name="QtGui/typesystem_gui.xml" generate="no" />
   <load-typesystem name="templates/opengl_common.xml" generate="no" />
 
-  <?if !darwin?>
-  <?entity GLint int?>
-  <?entity GLuint unsigned int?>
-  <?entity GLbyte unsigned char?>
-  <?entity GLboolean unsigned char?>
-  <?entity GLsizei int?>
-  <?entity GLsizeiptr long?>
-  <?entity GLintptr long?>
-  <?endif?>
-
-  <?if darwin?>
-  <?entity GLint int32_t?>
-  <?entity GLuint uint32_t?>
-  <?entity GLbyte uint8_t?>
-  <?entity GLboolean uint8_t?>
-  <?entity GLsizei int32_t?>
-  <?entity GLsizeiptr intptr_t?>
-  <?entity GLintptr intptr_t?>
-  <?endif?>
-
   <rejection class="^QOpenGL.*$" argument-type="^const GLboolean ?\*$"/>
   <rejection class="^QOpenGL.*$" argument-type="^GLchar\*$"/>
   <rejection class="^QOpenGL.*$" argument-type="^(const )?GLchar ?\*(const)?\*$"/>
@@ -634,19 +614,19 @@
       <modify-function signature="setUniformValueArray(int,const float*,int,int)">
           <modify-argument index="2"><array/></modify-argument>
       </modify-function>
-      <modify-function signature="setUniformValueArray(int,const &GLint;*,int)">
+      <modify-function signature="setUniformValueArray(int,const GLint*,int)">
           <modify-argument index="2"><array/></modify-argument>
       </modify-function>
-      <modify-function signature="setUniformValueArray(int,const &GLuint;*,int)">
+      <modify-function signature="setUniformValueArray(int,const GLuint*,int)">
           <modify-argument index="2"><array/></modify-argument>
       </modify-function>
       <modify-function signature="setUniformValueArray(const char*,const float*,int,int)">
           <modify-argument index="2"><array/></modify-argument>
       </modify-function>
-      <modify-function signature="setUniformValueArray(const char*,const &GLint;*,int)">
+      <modify-function signature="setUniformValueArray(const char*,const GLint*,int)">
           <modify-argument index="2"><array/></modify-argument>
       </modify-function>
-      <modify-function signature="setUniformValueArray(const char*,const &GLuint;*,int)">
+      <modify-function signature="setUniformValueArray(const char*,const GLuint*,int)">
           <modify-argument index="2"><array/></modify-argument>
       </modify-function>
       <!-- Add explicit signatures for the setUniformValue functions -->
@@ -655,13 +635,13 @@
       <add-function signature="setUniformValue1f(const char*, float)" return-type="void">
           <inject-code file="../glue/qtopengl.cpp" snippet="qopenglshaderprogram_setuniformvalue_float"/>
       </add-function>
-      <add-function signature="setUniformValue1i(const char*, &GLint;)" return-type="void">
+      <add-function signature="setUniformValue1i(const char*, GLint)" return-type="void">
           <inject-code file="../glue/qtopengl.cpp" snippet="qopenglshaderprogram_setuniformvalue_int"/>
       </add-function>
-      <add-function signature="setUniformValue1f(&GLint;, float)" return-type="void">
+      <add-function signature="setUniformValue1f(GLint, float)" return-type="void">
           <inject-code file="../glue/qtopengl.cpp" snippet="qopenglshaderprogram_setuniformvalue_float"/>
       </add-function>
-      <add-function signature="setUniformValue1i(&GLint;, &GLint;)" return-type="void">
+      <add-function signature="setUniformValue1i(GLint, GLint)" return-type="void">
           <inject-code file="../glue/qtopengl.cpp" snippet="qopenglshaderprogram_setuniformvalue_int"/>
       </add-function>
   </object-type>
diff --git a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications1_0_compat.xml b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications1_0_compat.xml
index dca124ccc..a5f8ee77a 100644
--- a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications1_0_compat.xml
+++ b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications1_0_compat.xml
@@ -6,7 +6,7 @@
 <modify-function signature="^glColor[34][a-z]{1,2}v\(.*$">
     <modify-argument index="1"><array/></modify-argument>
 </modify-function>
-<modify-function signature="glClipPlane(&GLuint;,const double *)">
+<modify-function signature="glClipPlane(GLenum,const GLdouble*)">
     <modify-argument index="2"><array/></modify-argument>
 </modify-function>
 <modify-function signature="^glEvalCoord\d[a-z]{1,2}v\(.*$">
diff --git a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications4_1.xml b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications4_1.xml
index af28f00cf..0fb6cd49a 100644
--- a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications4_1.xml
+++ b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications4_1.xml
@@ -5,7 +5,7 @@
 <modify-function signature="^gl(DepthRange|Scissor|Viewport)Arrayv\(.*$">
     <modify-argument index="3"><array/></modify-argument>
 </modify-function>
-<modify-function signature="glGetDoublei_v(&GLuint;,&GLuint;,double*)">
+<modify-function signature="glGetDoublei_v(GLenum,GLuint,GLdouble*)">
     <modify-argument index="return" pyi-type="Union[float,numpy.ndarray]">
         <replace-type modified-type="PyObject"/>
     </modify-argument>
@@ -14,7 +14,7 @@
     </modify-argument>
     <inject-code class="target" position="beginning" file="../glue/qtgui.cpp" snippet="qopenglextrafunctions-glgetdoublei-v"/>
 </modify-function>
-<modify-function signature="glGetFloati_v(&GLuint;,&GLuint;,float*)">
+<modify-function signature="glGetFloati_v(GLenum,GLuint,GLfloat*)">
     <modify-argument index="return" pyi-type="Union[float,numpy.ndarray]">
         <replace-type modified-type="PyObject"/>
     </modify-argument>
@@ -35,6 +35,6 @@
 <modify-function signature="^gl(Scissor|Viewport)Indexedf?v\(.*$">
     <modify-argument index="2"><array/></modify-argument>
 </modify-function>
-<modify-function signature="glShaderBinary(&GLint;,const &GLuint;*,&GLuint;,const void *,&GLint;)">
+<modify-function signature="^glShaderBinary\(GLsizei,const GLuint\*,.*$">
     <modify-argument index="2"><array/></modify-argument>
 </modify-function>
diff --git a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications4_4.xml b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications4_4.xml
index 8087ba071..cf90e4e0b 100644
--- a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications4_4.xml
+++ b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications4_4.xml
@@ -5,12 +5,12 @@
 <modify-function signature="^glBindBuffersBase\(.*$">
     <modify-argument index="4"><array/></modify-argument>
 </modify-function>
-<modify-function signature="glBindBuffersRange(&GLuint;, &GLuint;,&GLint;,const &GLuint; *,const &GLintptr;*,const &GLsizeiptr;*)">
+<modify-function signature="glBindBuffersRange(GLenum,GLuint,GLsizei,const GLuint*,const GLintptr*,const GLsizeiptr*)">
     <modify-argument index="4"><array/></modify-argument>
     <modify-argument index="5"><array/></modify-argument>
     <modify-argument index="6"><array/></modify-argument>
 </modify-function>
-<modify-function signature="glBindVertexBuffers(&GLuint;,&GLint;,const &GLuint; *,const &GLintptr;*,const &GLsizei;*)">
+<modify-function signature="glBindVertexBuffers(GLuint,GLsizei,const GLuint*,const GLintptr*,const GLsizei*)">
     <modify-argument index="3"><array/></modify-argument>
     <modify-argument index="4"><array/></modify-argument>
     <modify-argument index="5"><array/></modify-argument>
diff --git a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications4_5.xml b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications4_5.xml
index 055025080..826727736 100644
--- a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications4_5.xml
+++ b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications4_5.xml
@@ -14,7 +14,7 @@
 <modify-function signature="^glTextureParameterI?u?[fi]v\(.*$">
     <modify-argument index="3"><array/></modify-argument>
 </modify-function>
-<modify-function signature="glVertexArrayVertexBuffers(&GLuint;, &GLuint;,&GLsizei;,const &GLuint; *,const &GLintptr;*,const &GLsizei;*)">
+<modify-function signature="glVertexArrayVertexBuffers(GLuint, GLuint,GLsizei,const GLuint *,const GLintptr*,const GLsizei*)">
     <modify-argument index="4"><array/></modify-argument>
     <modify-argument index="5"><array/></modify-argument>
     <modify-argument index="6"><array/></modify-argument>