diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-08-08 10:39:31 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-08-08 16:01:32 +0200 |
| commit | ccf0935984e43b76e7b09e2a33d00b961548c50b (patch) | |
| tree | be55d869e00eaa32c71136367145e58879e10b5a | |
| parent | ae297b960d031e2ef630bf914297e108434e5ad8 (diff) | |
QOpenGLFunctions: Restore old overloads of glGet(Float|Integer)_v()
glGet(Float|Integer)_v() had existing array modifications for the
float*/int* arrays, which were apparently an oversight.
Nevertheless, restore them and add the new functions using
add-function with a fixme-comment in case someone is actually using
them (passing in pre-allocated, writeable numpy arrays).
Amends 9fb437cd2d017648f4bfc522b47f9488b825909e.
Task-number: PYSIDE-2013
Task-number: PYSIDE-2017
Change-Id: I5b509193f7b34084f16439f2454ebedb171c4a0c
Reviewed-by: Christian Tismer <tismer@stackless.com>
| -rw-r--r-- | sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml b/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml index 4fcb497ad..a300f517c 100644 --- a/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml +++ b/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml @@ -2926,26 +2926,26 @@ <inject-code class="target" position="beginning" file="../glue/qtgui.cpp" snippet="qopenglfunctions-glgetbooleanv"/> </modify-function> + <!-- FIXME PYSIDE 7: Use the remove array modification and use + the version with return value instead --> <modify-function signature="glGetFloatv(&GLuint;,float*)"> - <modify-argument index="return" pyi-type="Union[float,numpy.ndarray]"> - <replace-type modified-type="PyObject"/> - </modify-argument> - <modify-argument index="2"> - <remove-argument/> - </modify-argument> + <modify-argument index="2"><array/></modify-argument> + </modify-function> + <add-function signature="glGetFloatv(&GLuint;)" return-type="PyObject"> + <modify-argument index="return" pyi-type="Union[float,numpy.ndarray]"/> <inject-code class="target" position="beginning" file="../glue/qtgui.cpp" snippet="qopenglfunctions-glgetfloatv"/> - </modify-function> + </add-function> + <!-- FIXME PYSIDE 7: Use the remove array modification and use + the version with return value instead --> <modify-function signature="glGetIntegerv(&GLuint;,&GLint;*)"> - <modify-argument index="return" pyi-type="Union[int,numpy.ndarray]"> - <replace-type modified-type="PyObject"/> - </modify-argument> - <modify-argument index="2"> - <remove-argument/> - </modify-argument> + <modify-argument index="2"><array/></modify-argument> + </modify-function> + <add-function signature="glGetIntegerv(&GLuint;)" return-type="PyObject"> + <modify-argument index="return" pyi-type="Union[int,numpy.ndarray]"/> <inject-code class="target" position="beginning" file="../glue/qtgui.cpp" snippet="qopenglfunctions-glgetintegerv"/> - </modify-function> + </add-function> <modify-function signature="glGetProgramiv(&GLuint;,&GLuint;,&GLint;*)"> <modify-argument index="3"><array/></modify-argument> </modify-function> |