aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2019-02-01 11:32:10 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2019-02-01 18:00:41 +0000
commit509d478c33b6e65a31d41ef2891e489349e20637 (patch)
tree439ce76e03ff8e1d702378f83cfc6f23627ea656
parent50d4ab7a98753edcf52cc5faa5b0491c8187d022 (diff)
PySide2/QtGui: Add more array modifications for const (unsigned) int * parameters
Fix warnings: There's no user provided way (conversion rule, argument removal, custom code, etc) to handle the primitive type 'const unsigned int *' of argument 5 in function 'QOpenGLExtraFunctions::glDebugMessageControl(unsigned int source, unsigned int type, unsigned int severity, int count, const unsigned int * ids, unsigned char enabled)'. 'const int *' of argument 3 in function 'QOpenGLExtraFunctions::glSamplerParameterIiv(unsigned int sampler, unsigned int pname, const int * param)'. 'const unsigned int *' of argument 3 in function 'QOpenGLExtraFunctions::glSamplerParameterIuiv(unsigned int sampler, unsigned int pname, const unsigned int * param)'. 'const int *' of argument 3 in function 'QOpenGLExtraFunctions::glTexParameterIiv(unsigned int target, unsigned int pname, const int * params)'. 'const unsigned int *' of argument 3 in function 'QOpenGLExtraFunctions::glTexParameterIuiv(unsigned int target, unsigned int pname, const unsigned int * params)'. 'const unsigned int *' of argument 2 in function 'QOpenGLFunctions::glShaderBinary(int n, const unsigned int * shaders, unsigned int binaryformat, const void * binary, int length)'. Change-Id: I764823352fc4360d167acb07e8502a1dc8c060dc Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Christian Tismer <tismer@stackless.com>
-rw-r--r--sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml14
1 files changed, 13 insertions, 1 deletions
diff --git a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
index f3350b8c5..e61e1b6e7 100644
--- a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
+++ b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
@@ -2577,6 +2577,9 @@
<modify-function signature="^glClearBuffer.*\(.*\*.*$">
<modify-argument index="3"><array/></modify-argument>
</modify-function>
+ <modify-function signature="glDebugMessageControl(unsigned int,unsigned int,unsigned int,int,const unsigned int*,unsigned char)">
+ <modify-argument index="5"><array/></modify-argument>
+ </modify-function>
<modify-function signature="glDeleteProgramPipelines(int,const unsigned int*)">
<modify-argument index="2"><array/></modify-argument>
</modify-function>
@@ -2742,6 +2745,12 @@
<modify-function signature="glSamplerParameteriv(unsigned int,unsigned int,const int*)">
<modify-argument index="3"><array/></modify-argument>
</modify-function>
+ <modify-function signature="^glSamplerParameterI?u?[fi]v\(.*$">
+ <modify-argument index="3"><array/></modify-argument>
+ </modify-function>
+ <modify-function signature="^glTexParameterI?u?[fi]v\(.*$">
+ <modify-argument index="3"><array/></modify-argument>
+ </modify-function>
<modify-function signature="glUniform1uiv(int,int,const unsigned int*)">
<modify-argument index="3"><array/></modify-argument>
</modify-function>
@@ -2822,7 +2831,7 @@
<modify-function signature="^glGen[A-Z].*s\(.*$">
<modify-argument index="2"><array/></modify-argument>
</modify-function>
- <modify-function signature="^gl(Get)?TexParameter[fi]v\(.*$">
+ <modify-function signature="^gl(Get)?TexParameterI?u?[fi]v\(.*$">
<modify-argument index="3"><array/></modify-argument>
</modify-function>
<modify-function signature="^glUniformMatrix\dfv\(.*$">
@@ -2845,6 +2854,9 @@
<insert-template name="glGetString_return_QString"/>
</inject-code>
</modify-function>
+ <modify-function signature="glShaderBinary(int,const unsigned int*,unsigned int,const void *,int)">
+ <modify-argument index="2"><array/></modify-argument>
+ </modify-function>
</object-type>
<object-type name="QAbstractOpenGLFunctions" since="5.1"/>
<!-- Classes are result of a macro expansion in src/gui/opengl/qopenglversionfunctions.h