aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2021-08-30 10:03:09 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2021-08-30 21:34:49 +0200
commit1a185feb6779ecdead6ae88f8f44f1d18616b37a (patch)
treee51c40e7afb1305d936ef32306c2ec89091cc439
parentd21939ce6a4b5a2e9a90956c4c7703b60eeed293 (diff)
Add GLsizeiptr, GLintptr
Task-number: PYSIDE-1646 Change-Id: Ic102876f4ce0c9a860e6b440dab290a026d5829d Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
-rw-r--r--sources/pyside6/PySide6/QtCore/typesystem_core_common.xml2
-rw-r--r--sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml4
-rw-r--r--sources/pyside6/PySide6/QtOpenGL/typesystem_opengl.xml8
-rw-r--r--sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications4_4.xml4
-rw-r--r--sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications4_5.xml2
-rw-r--r--sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/mapping.py3
6 files changed, 20 insertions, 3 deletions
diff --git a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml
index 38f889599..6d8d15401 100644
--- a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml
+++ b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml
@@ -216,6 +216,8 @@
<primitive-type name="uint32_t"/>
<primitive-type name="int64_t"/>
<primitive-type name="uint64_t"/>
+ <primitive-type name="intptr_t"/>
+ <primitive-type name="uintptr_t"/>
<?if windows darwin?>
<primitive-type name="Qt::HANDLE" target-lang-api-name="PyObject"/>
diff --git a/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml b/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml
index b8292cbd2..31b469e71 100644
--- a/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml
+++ b/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml
@@ -53,6 +53,8 @@
<?entity GLbyte unsigned char?>
<?entity GLboolean unsigned char?>
<?entity GLsizei int?>
+ <?entity GLsizeiptr long?>
+ <?entity GLintptr long?>
<?endif?>
<?if darwin?>
@@ -61,6 +63,8 @@
<?entity GLbyte uint8_t?>
<?entity GLboolean uint8_t?>
<?entity GLsizei int32_t?>
+ <?entity GLsizeiptr intptr_t?>
+ <?entity GLintptr intptr_t?>
<?endif?>
<rejection class="^Q.*$" argument-type="^QPlatform.*$"/>
diff --git a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl.xml b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl.xml
index a0bc71c26..7b59a8c07 100644
--- a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl.xml
+++ b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl.xml
@@ -48,12 +48,20 @@
<?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 ?\*$"/>
diff --git a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications4_4.xml b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications4_4.xml
index a638a9371..d4a2762d9 100644
--- a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications4_4.xml
+++ b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications4_4.xml
@@ -41,12 +41,12 @@
<modify-function signature="^glBindBuffersBase\(.*$">
<modify-argument index="4"><array/></modify-argument>
</modify-function>
-<modify-function signature="glBindBuffersRange(&GLuint;, &GLuint;,&GLint;,const &GLuint; *,const long *,const long*)">
+<modify-function signature="glBindBuffersRange(&GLuint;, &GLuint;,&GLint;,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 long *,const &GLint; *)">
+<modify-function signature="glBindVertexBuffers(&GLuint;,&GLint;,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 2ff102463..dbea4092f 100644
--- a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications4_5.xml
+++ b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications4_5.xml
@@ -50,7 +50,7 @@
<modify-function signature="^glTextureParameterI?u?[fi]v\(.*$">
<modify-argument index="3"><array/></modify-argument>
</modify-function>
-<modify-function signature="glVertexArrayVertexBuffers(&GLuint;, &GLuint;,int,const &GLuint; *,const long *,const &GLint; *)">
+<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>
diff --git a/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/mapping.py b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/mapping.py
index e344f826f..b1eb44f15 100644
--- a/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/mapping.py
+++ b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/mapping.py
@@ -251,6 +251,8 @@ type_map.update({
"int32_t": int,
"int64_t": int,
"int8_t": int,
+ "intptr_t": int,
+ "uintptr_t": int,
"qintptr": int,
"qsizetype": int,
"QList": ArrayLikeVariable,
@@ -339,6 +341,7 @@ type_map.update({
"array uint16_t*" : ArrayLikeVariable(int),
"array int32_t*" : ArrayLikeVariable(int),
"array uint32_t*" : ArrayLikeVariable(int),
+ "array intptr_t*" : ArrayLikeVariable(int),
})
type_map.update({