diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-08-04 13:43:28 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-08-11 14:22:22 +0200 |
| commit | 0d3b7313c1c6b57a8c12f65265e71c42b6428f3f (patch) | |
| tree | f1a87fbbb499878b240fc3c094340644ab0e7f7c /sources/pyside6/PySide6 | |
| parent | 660485ee362180ee023b88ebbfd1e5dbf1175ae6 (diff) | |
Add glGet(Boolean|Double|Float|Integer)v() to QtOpenGL's versioned functions
The functions were so far excluded by a parameter type exclusion. To
make them visible, exclude the other getters explicitly by name
instead by parameter. This enables adding further getters step by
step. Add entities to be used in each of the classes, reusing
the snippets from QtGui.
[ChangeLog][PySide6] The glGet(Boolean|Double|Float|Integer)v()
functions have been added.
Task-number: PYSIDE-2013
Fixes: PYSIDE-2017
Change-Id: I096c9ee6428af6fc0bb6cfae3ca6f021106c3320
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/pyside6/PySide6')
6 files changed, 250 insertions, 3 deletions
diff --git a/sources/pyside6/PySide6/QtOpenGL/CMakeLists.txt b/sources/pyside6/PySide6/QtOpenGL/CMakeLists.txt index 03c3fbdb0..e22b768e4 100644 --- a/sources/pyside6/PySide6/QtOpenGL/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtOpenGL/CMakeLists.txt @@ -2,6 +2,10 @@ project(QtOpenGL) set(QtOpenGL_DROPPED_ENTRIES) +set(QtOpenGL_static_sources + "${QtOpenGL_SOURCE_DIR}/glue/utils.cpp" +) + set(QtOpenGL_SRC ${QtOpenGL_GEN_DIR}/qabstractopenglfunctions_wrapper.cpp ${QtOpenGL_GEN_DIR}/qopengldebuglogger_wrapper.cpp @@ -89,4 +93,5 @@ create_pyside_module(NAME QtOpenGL DEPS QtOpenGL_deps TYPESYSTEM_PATH QtOpenGL_SOURCE_DIR SOURCES QtOpenGL_SRC + STATIC_SOURCES QtOpenGL_static_sources DROPPED_ENTRIES QtOpenGL_DROPPED_ENTRIES) diff --git a/sources/pyside6/PySide6/QtOpenGL/glue/utils.cpp b/sources/pyside6/PySide6/QtOpenGL/glue/utils.cpp new file mode 100644 index 000000000..49d66e3a6 --- /dev/null +++ b/sources/pyside6/PySide6/QtOpenGL/glue/utils.cpp @@ -0,0 +1,30 @@ +// Copyright (C) 2022 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + +#include <QtGui/QOpenGLFunctions> + +// Return the number of return values of the glGetBoolean/Double/Integerv functions +// cf https://registry.khronos.org/OpenGL-Refpages/gl4/html/glGet.xhtml +int glGetVReturnSize(GLenum pname) +{ + switch (pname) { + case GL_ALIASED_LINE_WIDTH_RANGE: + case GL_DEPTH_RANGE: + case GL_MAX_VIEWPORT_DIMS: + case GL_POINT_SIZE_RANGE: + case GL_SMOOTH_LINE_WIDTH_RANGE: + case GL_VIEWPORT_BOUNDS_RANGE: + return 2; + case GL_BLEND_COLOR: + case GL_COLOR_CLEAR_VALUE: + case GL_COLOR_WRITEMASK: + case GL_SCISSOR_BOX: + case GL_VIEWPORT: + return 4; + case GL_COMPRESSED_TEXTURE_FORMATS: + return GL_NUM_COMPRESSED_TEXTURE_FORMATS; + default: + break; + } + return 1; +} diff --git a/sources/pyside6/PySide6/QtOpenGL/typesystem_glgetv_includes.xml b/sources/pyside6/PySide6/QtOpenGL/typesystem_glgetv_includes.xml new file mode 100644 index 000000000..3f48f19b8 --- /dev/null +++ b/sources/pyside6/PySide6/QtOpenGL/typesystem_glgetv_includes.xml @@ -0,0 +1,5 @@ +<extra-includes> + <include file-name="QtCore/QVarLengthArray" location="global"/> + <include file-name="sbkcpptonumpy.h" location="global"/> +</extra-includes> +<inject-code class="native" position="beginning" file="../glue/qtopengl.cpp" snippet="glgetvreturnsize_declaration"/> diff --git a/sources/pyside6/PySide6/QtOpenGL/typesystem_glgetv_modifications.xml b/sources/pyside6/PySide6/QtOpenGL/typesystem_glgetv_modifications.xml new file mode 100644 index 000000000..cb113d0ce --- /dev/null +++ b/sources/pyside6/PySide6/QtOpenGL/typesystem_glgetv_modifications.xml @@ -0,0 +1,36 @@ +<modify-function signature="glGetBooleanv(&GLuint;,&GLboolean;*)"> + <modify-argument index="return" pyi-type="Union[bool,numpy.ndarray]"> + <replace-type modified-type="PyObject"/> + </modify-argument> + <modify-argument index="2"> + <remove-argument/> + </modify-argument> + <inject-code class="target" position="beginning" file="../glue/qtgui.cpp" snippet="qopenglfunctions-glgetbooleanv"/> +</modify-function> +<modify-function signature="glGetDoublev(&GLuint;,double*)"> + <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> + <inject-code class="target" position="beginning" file="../glue/qtgui.cpp" snippet="qopenglfunctions-glgetdoublev"/> +</modify-function> +<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> + <inject-code class="target" position="beginning" file="../glue/qtgui.cpp" snippet="qopenglfunctions-glgetfloatv"/> +</modify-function> +<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> + <inject-code class="target" position="beginning" file="../glue/qtgui.cpp" snippet="qopenglfunctions-glgetintegerv"/> +</modify-function> diff --git a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl.xml b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl.xml index 05f2f20a1..7b8fdcc57 100644 --- a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl.xml +++ b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl.xml @@ -28,7 +28,7 @@ <?entity GLintptr intptr_t?> <?endif?> - <rejection class="^QOpenGL.*$" argument-type="^(const )?GLboolean ?\*$"/> + <rejection class="^QOpenGL.*$" argument-type="^const GLboolean ?\*$"/> <rejection class="^QOpenGL.*$" argument-type="^GLchar\*$"/> <rejection class="^QOpenGL.*$" argument-type="^(const )?GLchar ?\*(const)?\*$"/> <rejection class="^QOpenGL.*$" argument-type="^char\*$"/> @@ -43,10 +43,126 @@ <rejection class="^QOpenGL.*$" argument-type="QOpenGLTextureHelper*"/> <rejection class="^QOpenGL.*$" argument-type="^(const )?QVector.D ?\*$"/> <rejection class="^QOpenGL.*$" argument-type="^(const )?void ?\*\*$"/> + + <!-- Reject any non-const array of the version functions --> <rejection class="^QOpenGLFunctions.*$" function-name="^glGet(Buffer|VertexAttrib)?Pointer.*$"/> <rejection class="^QOpenGLFunctions.*$" function-name="^glMultiDrawElements.*$"/> - <!-- Reject any non-const array of the version functions --> - <rejection class="^QOpenGLFunctions_\d_\d.*$" argument-type="^GL\w+ ?\*$"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glAreTexturesResident"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glCreateBuffers"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glCreateFramebuffers"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glCreateProgramPipelines"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glCreateQueries"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glCreateRenderbuffers"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glCreateSamplers"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glCreateTextures"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glCreateTransformFeedbacks"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glCreateVertexArrays"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glFeedbackBuffer"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGenBuffers"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGenFramebuffers"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGenProgramPipelines"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGenQueries"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGenRenderbuffers"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGenSamplers"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGenTextures"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGenTransformFeedbacks"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGenVertexArrays"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetActiveAtomicCounterBufferiv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetActiveSubroutineUniformiv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetActiveUniformBlockiv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetActiveUniformsiv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetAttachedShaders"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetBooleani_v"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetBufferParameteriv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetClipPlane"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetColorTableParameterfv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetColorTableParameteriv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetConvolutionParameterfv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetConvolutionParameteriv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetDoublei_v"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetFloati_v"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetFramebufferAttachmentParameteriv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetFramebufferParameteriv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetHistogramParameterfv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetHistogramParameteriv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetIntegeri_v"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetInternalformativ"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetLightfv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetLightiv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetMapdv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetMapfv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetMapiv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetMaterialfv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetMaterialiv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetMinmaxParameterfv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetMinmaxParameteriv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetMultisamplefv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetNamedBufferParameteriv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetNamedFramebufferAttachmentParameteriv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetNamedFramebufferParameteriv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetNamedRenderbufferParameteriv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetnMapdv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetnMapfv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetnMapiv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetnPixelMapfv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetnPixelMapuiv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetnPixelMapusv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetnUniformdv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetnUniformfv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetnUniformiv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetnUniformuiv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetPixelMapfv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetPixelMapuiv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetPixelMapusv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetProgramInterfaceiv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetProgramiv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetProgramPipelineiv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetProgramResourceiv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetProgramStageiv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetQueryIndexediv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetQueryiv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetQueryObjectiv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetQueryObjectuiv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetRenderbufferParameteriv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetSamplerParameterfv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetSamplerParameterIiv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetSamplerParameterIuiv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetSamplerParameteriv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetShaderiv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetShaderPrecisionFormat"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetTexEnvfv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetTexEnviv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetTexGendv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetTexGenfv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetTexGeniv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetTexLevelParameterfv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetTexLevelParameteriv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetTexParameterfv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetTexParameterIiv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetTexParameterIuiv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetTexParameteriv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetTextureLevelParameterfv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetTextureLevelParameteriv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetTextureParameterfv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetTextureParameterIiv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetTextureParameterIuiv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetTextureParameteriv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetTransformFeedbacki_v"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetTransformFeedbackiv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetUniformdv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetUniformfv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetUniformiv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetUniformSubroutineuiv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetUniformuiv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetVertexArrayIndexediv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetVertexArrayiv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetVertexAttribdv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetVertexAttribfv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetVertexAttribIiv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetVertexAttribIuiv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetVertexAttribiv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glGetVertexAttribLdv"/> + <rejection class="^QOpenGLFunctions_\d_\d.*$" function-name="glSelectBuffer"/> <object-type name="QOpenGLBuffer" since="5.0"> <enum-type name="Access"/> @@ -64,16 +180,22 @@ </value-type> <object-type name="QOpenGLFunctions_1_0" since="5.1"> + &glgetv_includes; + &glgetv_modifications; &opengl_modifications1_0; &opengl_modifications1_0_compat; </object-type> <object-type name="QOpenGLFunctions_1_1" since="5.1"> + &glgetv_includes; + &glgetv_modifications; &opengl_modifications1_0; &opengl_modifications1_0_compat; &opengl_modifications1_1; &opengl_modifications1_1_compat; </object-type> <object-type name="QOpenGLFunctions_1_2" since="5.1"> + &glgetv_includes; + &glgetv_modifications; &opengl_modifications1_0; &opengl_modifications1_0_compat; &opengl_modifications1_1; @@ -81,6 +203,8 @@ &opengl_modifications1_2_compat; </object-type> <object-type name="QOpenGLFunctions_1_3" since="5.1"> + &glgetv_includes; + &glgetv_modifications; &opengl_modifications1_0; &opengl_modifications1_0_compat; &opengl_modifications1_1; @@ -89,6 +213,8 @@ &opengl_modifications1_3_compat; </object-type> <object-type name="QOpenGLFunctions_1_4" since="5.1"> + &glgetv_includes; + &glgetv_modifications; &opengl_modifications1_0; &opengl_modifications1_0_compat; &opengl_modifications1_1; @@ -99,6 +225,8 @@ &opengl_modifications1_4_compat; </object-type> <object-type name="QOpenGLFunctions_1_5" since="5.1"> + &glgetv_includes; + &glgetv_modifications; &opengl_modifications1_0; &opengl_modifications1_0_compat; &opengl_modifications1_1; @@ -109,6 +237,8 @@ &opengl_modifications1_4_compat; </object-type> <object-type name="QOpenGLFunctions_2_0" since="5.1"> + &glgetv_includes; + &glgetv_modifications; &opengl_modifications1_0; &opengl_modifications1_0_compat; &opengl_modifications1_1; @@ -121,6 +251,8 @@ &opengl_modifications2_0_compat; </object-type> <object-type name="QOpenGLFunctions_2_1" since="5.1"> + &glgetv_includes; + &glgetv_modifications; &opengl_modifications1_0; &opengl_modifications1_0_compat; &opengl_modifications1_1; @@ -134,6 +266,8 @@ &opengl_modifications2_1; </object-type> <object-type name="QOpenGLFunctions_3_0" since="5.1"> + &glgetv_includes; + &glgetv_modifications; &opengl_modifications1_0; &opengl_modifications1_0_compat; &opengl_modifications1_1; @@ -148,6 +282,8 @@ &opengl_modifications3_0; </object-type> <object-type name="QOpenGLFunctions_3_1" since="5.1"> + &glgetv_includes; + &glgetv_modifications; &opengl_modifications1_0; &opengl_modifications1_1; &opengl_modifications1_4; @@ -156,6 +292,8 @@ &opengl_modifications3_0; </object-type> <object-type name="QOpenGLFunctions_3_2_Compatibility" since="5.1"> + &glgetv_includes; + &glgetv_modifications; &opengl_modifications1_0; &opengl_modifications1_0_compat; &opengl_modifications1_1; @@ -170,6 +308,8 @@ &opengl_modifications3_0; </object-type> <object-type name="QOpenGLFunctions_3_2_Core" since="5.1"> + &glgetv_includes; + &glgetv_modifications; &opengl_modifications1_0; &opengl_modifications1_1; &opengl_modifications1_4; @@ -178,6 +318,8 @@ &opengl_modifications3_0; </object-type> <object-type name="QOpenGLFunctions_3_3_Compatibility" since="5.1"> + &glgetv_includes; + &glgetv_modifications; &opengl_modifications1_0; &opengl_modifications1_0_compat; &opengl_modifications1_1; @@ -194,6 +336,8 @@ &opengl_modifications3_3a; </object-type> <object-type name="QOpenGLFunctions_3_3_Core" since="5.1"> + &glgetv_includes; + &glgetv_modifications; &opengl_modifications1_0; &opengl_modifications1_1; &opengl_modifications1_4; @@ -203,6 +347,8 @@ &opengl_modifications3_3; </object-type> <object-type name="QOpenGLFunctions_4_0_Compatibility" since="5.1"> + &glgetv_includes; + &glgetv_modifications; &opengl_modifications1_0; &opengl_modifications1_0_compat; &opengl_modifications1_1; @@ -220,6 +366,8 @@ &opengl_modifications4_0; </object-type> <object-type name="QOpenGLFunctions_4_0_Core" since="5.1"> + &glgetv_includes; + &glgetv_modifications; &opengl_modifications1_0; &opengl_modifications1_1; &opengl_modifications1_4; @@ -230,6 +378,8 @@ &opengl_modifications4_0; </object-type> <object-type name="QOpenGLFunctions_4_1_Compatibility" since="5.1"> + &glgetv_includes; + &glgetv_modifications; &opengl_modifications1_0; &opengl_modifications1_0_compat; &opengl_modifications1_1; @@ -248,6 +398,8 @@ &opengl_modifications4_0; </object-type> <object-type name="QOpenGLFunctions_4_1_Core" since="5.1"> + &glgetv_includes; + &glgetv_modifications; &opengl_modifications1_0; &opengl_modifications1_1; &opengl_modifications1_4; @@ -260,6 +412,8 @@ &opengl_modifications_va; </object-type> <object-type name="QOpenGLFunctions_4_2_Compatibility" since="5.1"> + &glgetv_includes; + &glgetv_modifications; &opengl_modifications1_0; &opengl_modifications1_0_compat; &opengl_modifications1_1; @@ -278,6 +432,8 @@ &opengl_modifications4_1; </object-type> <object-type name="QOpenGLFunctions_4_2_Core" since="5.1"> + &glgetv_includes; + &glgetv_modifications; &opengl_modifications1_0; &opengl_modifications1_1; &opengl_modifications1_4; @@ -290,6 +446,8 @@ &opengl_modifications_va; </object-type> <object-type name="QOpenGLFunctions_4_3_Compatibility" since="5.1"> + &glgetv_includes; + &glgetv_modifications; &opengl_modifications1_0; &opengl_modifications1_0_compat; &opengl_modifications1_1; @@ -309,6 +467,8 @@ &opengl_modifications4_3; </object-type> <object-type name="QOpenGLFunctions_4_3_Core" since="5.1"> + &glgetv_includes; + &glgetv_modifications; &opengl_modifications1_0; &opengl_modifications1_1; &opengl_modifications1_4; @@ -322,6 +482,8 @@ &opengl_modifications_va; </object-type> <object-type name="QOpenGLFunctions_4_4_Compatibility" since="5.5"> + &glgetv_includes; + &glgetv_modifications; &opengl_modifications1_0; &opengl_modifications1_0_compat; &opengl_modifications1_1; @@ -343,6 +505,8 @@ &opengl_modifications4_4_core; </object-type> <object-type name="QOpenGLFunctions_4_4_Core" since="5.5"> + &glgetv_includes; + &glgetv_modifications; &opengl_modifications1_0; &opengl_modifications1_1; &opengl_modifications1_4; @@ -358,6 +522,8 @@ &opengl_modifications4_4_core; </object-type> <object-type name="QOpenGLFunctions_4_5_Compatibility" since="5.5"> + &glgetv_includes; + &glgetv_modifications; &opengl_modifications1_0; &opengl_modifications1_0_compat; &opengl_modifications1_1; @@ -380,6 +546,8 @@ &opengl_modifications4_5; </object-type> <object-type name="QOpenGLFunctions_4_5_Core" since="5.5"> + &glgetv_includes; + &glgetv_modifications; &opengl_modifications1_0; &opengl_modifications1_1; &opengl_modifications1_4; diff --git a/sources/pyside6/PySide6/glue/qtopengl.cpp b/sources/pyside6/PySide6/glue/qtopengl.cpp index 2e93ddda7..bde71058a 100644 --- a/sources/pyside6/PySide6/glue/qtopengl.cpp +++ b/sources/pyside6/PySide6/glue/qtopengl.cpp @@ -71,3 +71,6 @@ if (auto *f = dynamic_cast<QOpenGLFunctions_4_5_Core *>(af)) { } // @snippet qopenglversionfunctionsfactory-get +// @snippet glgetvreturnsize_declaration +int glGetVReturnSize(GLenum pname); +// @snippet glgetvreturnsize_declaration |
