diff options
Diffstat (limited to 'sources/pyside6/PySide6/QtOpenGL')
29 files changed, 509 insertions, 964 deletions
diff --git a/sources/pyside6/PySide6/QtOpenGL/CMakeLists.txt b/sources/pyside6/PySide6/QtOpenGL/CMakeLists.txt index 6e80a4e16..5bf8b5f3b 100644 --- a/sources/pyside6/PySide6/QtOpenGL/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtOpenGL/CMakeLists.txt @@ -1,7 +1,14 @@ +# Copyright (C) 2023 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + 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 @@ -27,43 +34,46 @@ get_property(QtGui_enabled_features TARGET Qt${QT_MAJOR_VERSION}::Gui PROPERTY QT_ENABLED_PUBLIC_FEATURES) if("opengles2" IN_LIST QtGui_enabled_features) - list(APPEND QtOpenGL_DROPPED_ENTRIES QOpenGLTimeMonitor QOpenGLTimerQuery) + list(APPEND QtOpenGL_DROPPED_ENTRIES QOpenGLTimeMonitor QOpenGLTimerQuery + QOpenGLVersionFunctionsFactory) list(APPEND QtOpenGL_SRC ${QtOpenGL_GEN_DIR}/qopenglfunctions_es2_wrapper.cpp) message(STATUS "Qt${QT_MAJOR_VERSION}Gui: Dropping Desktop OpenGL classes (GLES2)") else() + list(APPEND QtOpenGL_DROPPED_ENTRIES QOpenGLFunctions_ES2) list(APPEND QtOpenGL_SRC - ${QtOpenGL_GEN_DIR}/qopenglfunctions_1_0_wrapper.cpp - ${QtOpenGL_GEN_DIR}/qopenglfunctions_1_1_wrapper.cpp - ${QtOpenGL_GEN_DIR}/qopenglfunctions_1_2_wrapper.cpp - ${QtOpenGL_GEN_DIR}/qopenglfunctions_1_3_wrapper.cpp - ${QtOpenGL_GEN_DIR}/qopenglfunctions_1_4_wrapper.cpp - ${QtOpenGL_GEN_DIR}/qopenglfunctions_1_5_wrapper.cpp - ${QtOpenGL_GEN_DIR}/qopenglfunctions_2_0_wrapper.cpp - ${QtOpenGL_GEN_DIR}/qopenglfunctions_2_1_wrapper.cpp - ${QtOpenGL_GEN_DIR}/qopenglfunctions_3_0_wrapper.cpp - ${QtOpenGL_GEN_DIR}/qopenglfunctions_3_1_wrapper.cpp - ${QtOpenGL_GEN_DIR}/qopenglfunctions_3_2_compatibility_wrapper.cpp - ${QtOpenGL_GEN_DIR}/qopenglfunctions_3_2_core_wrapper.cpp - ${QtOpenGL_GEN_DIR}/qopenglfunctions_3_3_compatibility_wrapper.cpp - ${QtOpenGL_GEN_DIR}/qopenglfunctions_3_3_core_wrapper.cpp - ${QtOpenGL_GEN_DIR}/qopenglfunctions_4_0_compatibility_wrapper.cpp - ${QtOpenGL_GEN_DIR}/qopenglfunctions_4_0_core_wrapper.cpp - ${QtOpenGL_GEN_DIR}/qopenglfunctions_4_1_compatibility_wrapper.cpp - ${QtOpenGL_GEN_DIR}/qopenglfunctions_4_1_core_wrapper.cpp - ${QtOpenGL_GEN_DIR}/qopenglfunctions_4_2_compatibility_wrapper.cpp - ${QtOpenGL_GEN_DIR}/qopenglfunctions_4_2_core_wrapper.cpp - ${QtOpenGL_GEN_DIR}/qopenglfunctions_4_3_compatibility_wrapper.cpp - ${QtOpenGL_GEN_DIR}/qopenglfunctions_4_3_core_wrapper.cpp - ${QtOpenGL_GEN_DIR}/qopenglfunctions_4_4_compatibility_wrapper.cpp - ${QtOpenGL_GEN_DIR}/qopenglfunctions_4_4_core_wrapper.cpp - ${QtOpenGL_GEN_DIR}/qopenglfunctions_4_5_compatibility_wrapper.cpp - ${QtOpenGL_GEN_DIR}/qopenglfunctions_4_5_core_wrapper.cpp - ${QtOpenGL_GEN_DIR}/qopenglversionfunctionsfactory_wrapper.cpp - ${QtOpenGL_GEN_DIR}/qopengltimemonitor_wrapper.cpp - ${QtOpenGL_GEN_DIR}/qopengltimerquery_wrapper.cpp) + ${QtOpenGL_GEN_DIR}/qopenglfunctions_1_0_wrapper.cpp + ${QtOpenGL_GEN_DIR}/qopenglfunctions_1_1_wrapper.cpp + ${QtOpenGL_GEN_DIR}/qopenglfunctions_1_2_wrapper.cpp + ${QtOpenGL_GEN_DIR}/qopenglfunctions_1_3_wrapper.cpp + ${QtOpenGL_GEN_DIR}/qopenglfunctions_1_4_wrapper.cpp + ${QtOpenGL_GEN_DIR}/qopenglfunctions_1_5_wrapper.cpp + ${QtOpenGL_GEN_DIR}/qopenglfunctions_2_0_wrapper.cpp + ${QtOpenGL_GEN_DIR}/qopenglfunctions_2_1_wrapper.cpp + ${QtOpenGL_GEN_DIR}/qopenglfunctions_3_0_wrapper.cpp + ${QtOpenGL_GEN_DIR}/qopenglfunctions_3_1_wrapper.cpp + ${QtOpenGL_GEN_DIR}/qopenglfunctions_3_2_compatibility_wrapper.cpp + ${QtOpenGL_GEN_DIR}/qopenglfunctions_3_2_core_wrapper.cpp + ${QtOpenGL_GEN_DIR}/qopenglfunctions_3_3_compatibility_wrapper.cpp + ${QtOpenGL_GEN_DIR}/qopenglfunctions_3_3_core_wrapper.cpp + ${QtOpenGL_GEN_DIR}/qopenglfunctions_4_0_compatibility_wrapper.cpp + ${QtOpenGL_GEN_DIR}/qopenglfunctions_4_0_core_wrapper.cpp + ${QtOpenGL_GEN_DIR}/qopenglfunctions_4_1_compatibility_wrapper.cpp + ${QtOpenGL_GEN_DIR}/qopenglfunctions_4_1_core_wrapper.cpp + ${QtOpenGL_GEN_DIR}/qopenglfunctions_4_2_compatibility_wrapper.cpp + ${QtOpenGL_GEN_DIR}/qopenglfunctions_4_2_core_wrapper.cpp + ${QtOpenGL_GEN_DIR}/qopenglfunctions_4_3_compatibility_wrapper.cpp + ${QtOpenGL_GEN_DIR}/qopenglfunctions_4_3_core_wrapper.cpp + ${QtOpenGL_GEN_DIR}/qopenglfunctions_4_4_compatibility_wrapper.cpp + ${QtOpenGL_GEN_DIR}/qopenglfunctions_4_4_core_wrapper.cpp + ${QtOpenGL_GEN_DIR}/qopenglfunctions_4_5_compatibility_wrapper.cpp + ${QtOpenGL_GEN_DIR}/qopenglfunctions_4_5_core_wrapper.cpp + ${QtOpenGL_GEN_DIR}/qopenglversionfunctionsfactory_wrapper.cpp + ${QtOpenGL_GEN_DIR}/qopengltimemonitor_wrapper.cpp + ${QtOpenGL_GEN_DIR}/qopengltimerquery_wrapper.cpp) message(STATUS "Qt${QT_MAJOR_VERSION}OpenGL: Adding Desktop OpenGL classes") endif() + configure_file("${QtOpenGL_SOURCE_DIR}/QtOpenGL_global.post.h.in" "${QtOpenGL_BINARY_DIR}/QtOpenGL_global.post.h" @ONLY) @@ -77,8 +87,6 @@ set(QtOpenGL_include_dirs ${QtOpenGL_SOURCE_DIR} ${QtOpenGL_GEN_DIR} ) set(QtOpenGL_libraries pyside6 - ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES} - ${Qt${QT_MAJOR_VERSION}Gui_LIBRARIES} ${Qt${QT_MAJOR_VERSION}OpenGL_LIBRARIES}) set(QtOpenGL_deps QtGui) @@ -88,4 +96,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/QtOpenGL_global.post.h.in b/sources/pyside6/PySide6/QtOpenGL/QtOpenGL_global.post.h.in index 5df8043c7..571b245a3 100644 --- a/sources/pyside6/PySide6/QtOpenGL/QtOpenGL_global.post.h.in +++ b/sources/pyside6/PySide6/QtOpenGL/QtOpenGL_global.post.h.in @@ -1,34 +1,10 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt for Python. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - +// Copyright (C) 2021 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include <QtGui/qtgui-config.h> -// OpenGL functions are not in the QtGui module header -#if QT_CONFIG(opengl) + +#if QT_CONFIG(opengles2) +# include <QtOpenGL/qopenglfunctions_es2.h> +#elif QT_CONFIG(opengl) # include <QtOpenGL/qopenglfunctions_1_0.h> # include <QtOpenGL/qopenglfunctions_1_1.h> # include <QtOpenGL/qopenglfunctions_1_2.h> @@ -57,6 +33,3 @@ # include <QtOpenGL/qopenglfunctions_4_5_core.h> # include <QtOpenGL/qopenglversionfunctionsfactory.h> #endif -#if QT_CONFIG(opengles2) -# include <QtOpenGL/qopenglfunctions_es2.h> -#endif diff --git a/sources/pyside6/PySide6/QtOpenGL/glue/utils.cpp b/sources/pyside6/PySide6/QtOpenGL/glue/utils.cpp new file mode 100644 index 000000000..27a8a9fdf --- /dev/null +++ b/sources/pyside6/PySide6/QtOpenGL/glue/utils.cpp @@ -0,0 +1,40 @@ +// 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: +#if !QT_CONFIG(opengles2) + case GL_POINT_SIZE_RANGE: + case GL_SMOOTH_LINE_WIDTH_RANGE: + case GL_VIEWPORT_BOUNDS_RANGE: +#endif + 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; +} + +// Return the number of return values of the indexed +// glGetBoolean/Double/Integeri_v functions +// cf https://registry.khronos.org/OpenGL-Refpages/gl4/html/glGet.xhtml +int glGetI_VReturnSize(GLenum pname) +{ + return pname == GL_VIEWPORT ? 4 : 1; +} diff --git a/sources/pyside6/PySide6/QtOpenGL/typesystem_glgeti_v_includes.xml b/sources/pyside6/PySide6/QtOpenGL/typesystem_glgeti_v_includes.xml new file mode 100644 index 000000000..56ff7bcda --- /dev/null +++ b/sources/pyside6/PySide6/QtOpenGL/typesystem_glgeti_v_includes.xml @@ -0,0 +1 @@ +<inject-code class="native" position="beginning" file="../glue/qtopengl.cpp" snippet="glgeti-vreturnsize_declaration"/> diff --git a/sources/pyside6/PySide6/QtOpenGL/typesystem_glgeti_v_modifications.xml b/sources/pyside6/PySide6/QtOpenGL/typesystem_glgeti_v_modifications.xml new file mode 100644 index 000000000..f0e6084cf --- /dev/null +++ b/sources/pyside6/PySide6/QtOpenGL/typesystem_glgeti_v_modifications.xml @@ -0,0 +1,18 @@ +<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> + <modify-argument index="3"> + <remove-argument/> + </modify-argument> + <inject-code class="target" position="beginning" file="../glue/qtgui.cpp" snippet="qopenglextrafunctions-glgetbooleani-v"/> +</modify-function> +<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> + <modify-argument index="3"> + <remove-argument/> + </modify-argument> + <inject-code class="target" position="beginning" file="../glue/qtgui.cpp" snippet="qopenglextrafunctions-glgetintegeri-v"/> +</modify-function> 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..b5fab57ba --- /dev/null +++ b/sources/pyside6/PySide6/QtOpenGL/typesystem_glgetv_modifications.xml @@ -0,0 +1,36 @@ +<modify-function signature="glGetBooleanv(GLenum,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(GLenum,GLdouble*)"> + <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(GLenum,GLfloat*)"> + <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(GLenum,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 2d4fc1dd6..efbd16056 100644 --- a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl.xml +++ b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl.xml @@ -1,50 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt for Python. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2021 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 --> -<typesystem package="PySide6.QtOpenGL"> +<typesystem package="PySide6.QtOpenGL" + namespace-begin="QT_BEGIN_NAMESPACE" namespace-end="QT_END_NAMESPACE"> <load-typesystem name="QtCore/typesystem_core.xml" generate="no" /> <load-typesystem name="QtGui/typesystem_gui.xml" generate="no" /> <load-typesystem name="templates/opengl_common.xml" generate="no" /> - <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\*$"/> @@ -59,44 +24,167 @@ <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="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="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="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"> + <object-type name="QOpenGLBuffer"> <enum-type name="Access"/> <enum-type name="RangeAccessFlag" flags="RangeAccessFlags"/> <enum-type name="Type"/> <enum-type name="UsagePattern"/> + <modify-function signature="allocate(const void*,int)"> + <modify-argument index="1" pyi-type="bytes"/> + </modify-function> </object-type> - <object-type name="QOpenGLDebugLogger" since="5.1"> + <object-type name="QOpenGLDebugLogger"> <enum-type name="LoggingMode"/> </object-type> - <value-type name="QOpenGLDebugMessage" since="5.1"> + <value-type name="QOpenGLDebugMessage"> <enum-type name="Source" flags="Sources"/> <enum-type name="Type" flags="Types"/> <enum-type name="Severity" flags="Severities"/> </value-type> - <object-type name="QOpenGLFunctions_1_0" since="5.1"> + <object-type name="QOpenGLFunctions_1_0"> + &glgetv_includes; + &glgetv_modifications; &opengl_modifications1_0; &opengl_modifications1_0_compat; </object-type> - <object-type name="QOpenGLFunctions_1_1" since="5.1"> + <object-type name="QOpenGLFunctions_1_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"> + <object-type name="QOpenGLFunctions_1_2"> + &glgetv_includes; + &glgetv_modifications; &opengl_modifications1_0; &opengl_modifications1_0_compat; &opengl_modifications1_1; &opengl_modifications1_1_compat; &opengl_modifications1_2_compat; </object-type> - <object-type name="QOpenGLFunctions_1_3" since="5.1"> + <object-type name="QOpenGLFunctions_1_3"> + &glgetv_includes; + &glgetv_modifications; &opengl_modifications1_0; &opengl_modifications1_0_compat; &opengl_modifications1_1; @@ -104,7 +192,9 @@ &opengl_modifications1_2_compat; &opengl_modifications1_3_compat; </object-type> - <object-type name="QOpenGLFunctions_1_4" since="5.1"> + <object-type name="QOpenGLFunctions_1_4"> + &glgetv_includes; + &glgetv_modifications; &opengl_modifications1_0; &opengl_modifications1_0_compat; &opengl_modifications1_1; @@ -114,7 +204,9 @@ &opengl_modifications1_4; &opengl_modifications1_4_compat; </object-type> - <object-type name="QOpenGLFunctions_1_5" since="5.1"> + <object-type name="QOpenGLFunctions_1_5"> + &glgetv_includes; + &glgetv_modifications; &opengl_modifications1_0; &opengl_modifications1_0_compat; &opengl_modifications1_1; @@ -124,7 +216,9 @@ &opengl_modifications1_4; &opengl_modifications1_4_compat; </object-type> - <object-type name="QOpenGLFunctions_2_0" since="5.1"> + <object-type name="QOpenGLFunctions_2_0"> + &glgetv_includes; + &glgetv_modifications; &opengl_modifications1_0; &opengl_modifications1_0_compat; &opengl_modifications1_1; @@ -136,7 +230,9 @@ &opengl_modifications2_0; &opengl_modifications2_0_compat; </object-type> - <object-type name="QOpenGLFunctions_2_1" since="5.1"> + <object-type name="QOpenGLFunctions_2_1"> + &glgetv_includes; + &glgetv_modifications; &opengl_modifications1_0; &opengl_modifications1_0_compat; &opengl_modifications1_1; @@ -149,7 +245,11 @@ &opengl_modifications2_0_compat; &opengl_modifications2_1; </object-type> - <object-type name="QOpenGLFunctions_3_0" since="5.1"> + <object-type name="QOpenGLFunctions_3_0"> + &glgetv_includes; + &glgeti_v_includes; + &glgetv_modifications; + &glgeti_v_modifications; &opengl_modifications1_0; &opengl_modifications1_0_compat; &opengl_modifications1_1; @@ -163,7 +263,11 @@ &opengl_modifications2_1; &opengl_modifications3_0; </object-type> - <object-type name="QOpenGLFunctions_3_1" since="5.1"> + <object-type name="QOpenGLFunctions_3_1"> + &glgetv_includes; + &glgeti_v_includes; + &glgetv_modifications; + &glgeti_v_modifications; &opengl_modifications1_0; &opengl_modifications1_1; &opengl_modifications1_4; @@ -171,7 +275,11 @@ &opengl_modifications2_1; &opengl_modifications3_0; </object-type> - <object-type name="QOpenGLFunctions_3_2_Compatibility" since="5.1"> + <object-type name="QOpenGLFunctions_3_2_Compatibility"> + &glgetv_includes; + &glgeti_v_includes; + &glgetv_modifications; + &glgeti_v_modifications; &opengl_modifications1_0; &opengl_modifications1_0_compat; &opengl_modifications1_1; @@ -185,7 +293,11 @@ &opengl_modifications2_1; &opengl_modifications3_0; </object-type> - <object-type name="QOpenGLFunctions_3_2_Core" since="5.1"> + <object-type name="QOpenGLFunctions_3_2_Core"> + &glgetv_includes; + &glgeti_v_includes; + &glgetv_modifications; + &glgeti_v_modifications; &opengl_modifications1_0; &opengl_modifications1_1; &opengl_modifications1_4; @@ -193,7 +305,11 @@ &opengl_modifications2_1; &opengl_modifications3_0; </object-type> - <object-type name="QOpenGLFunctions_3_3_Compatibility" since="5.1"> + <object-type name="QOpenGLFunctions_3_3_Compatibility"> + &glgetv_includes; + &glgeti_v_includes; + &glgetv_modifications; + &glgeti_v_modifications; &opengl_modifications1_0; &opengl_modifications1_0_compat; &opengl_modifications1_1; @@ -209,7 +325,11 @@ &opengl_modifications3_3; &opengl_modifications3_3a; </object-type> - <object-type name="QOpenGLFunctions_3_3_Core" since="5.1"> + <object-type name="QOpenGLFunctions_3_3_Core"> + &glgetv_includes; + &glgeti_v_includes; + &glgetv_modifications; + &glgeti_v_modifications; &opengl_modifications1_0; &opengl_modifications1_1; &opengl_modifications1_4; @@ -218,7 +338,11 @@ &opengl_modifications3_0; &opengl_modifications3_3; </object-type> - <object-type name="QOpenGLFunctions_4_0_Compatibility" since="5.1"> + <object-type name="QOpenGLFunctions_4_0_Compatibility"> + &glgetv_includes; + &glgeti_v_includes; + &glgetv_modifications; + &glgeti_v_modifications; &opengl_modifications1_0; &opengl_modifications1_0_compat; &opengl_modifications1_1; @@ -235,7 +359,11 @@ &opengl_modifications3_3a; &opengl_modifications4_0; </object-type> - <object-type name="QOpenGLFunctions_4_0_Core" since="5.1"> + <object-type name="QOpenGLFunctions_4_0_Core"> + &glgetv_includes; + &glgeti_v_includes; + &glgetv_modifications; + &glgeti_v_modifications; &opengl_modifications1_0; &opengl_modifications1_1; &opengl_modifications1_4; @@ -245,7 +373,11 @@ &opengl_modifications3_3; &opengl_modifications4_0; </object-type> - <object-type name="QOpenGLFunctions_4_1_Compatibility" since="5.1"> + <object-type name="QOpenGLFunctions_4_1_Compatibility"> + &glgetv_includes; + &glgeti_v_includes; + &glgetv_modifications; + &glgeti_v_modifications; &opengl_modifications1_0; &opengl_modifications1_0_compat; &opengl_modifications1_1; @@ -263,7 +395,11 @@ &opengl_modifications4_1; &opengl_modifications4_0; </object-type> - <object-type name="QOpenGLFunctions_4_1_Core" since="5.1"> + <object-type name="QOpenGLFunctions_4_1_Core"> + &glgetv_includes; + &glgeti_v_includes; + &glgetv_modifications; + &glgeti_v_modifications; &opengl_modifications1_0; &opengl_modifications1_1; &opengl_modifications1_4; @@ -275,7 +411,11 @@ &opengl_modifications4_1; &opengl_modifications_va; </object-type> - <object-type name="QOpenGLFunctions_4_2_Compatibility" since="5.1"> + <object-type name="QOpenGLFunctions_4_2_Compatibility"> + &glgetv_includes; + &glgeti_v_includes; + &glgetv_modifications; + &glgeti_v_modifications; &opengl_modifications1_0; &opengl_modifications1_0_compat; &opengl_modifications1_1; @@ -293,7 +433,11 @@ &opengl_modifications4_0; &opengl_modifications4_1; </object-type> - <object-type name="QOpenGLFunctions_4_2_Core" since="5.1"> + <object-type name="QOpenGLFunctions_4_2_Core"> + &glgetv_includes; + &glgeti_v_includes; + &glgetv_modifications; + &glgeti_v_modifications; &opengl_modifications1_0; &opengl_modifications1_1; &opengl_modifications1_4; @@ -305,7 +449,11 @@ &opengl_modifications4_1; &opengl_modifications_va; </object-type> - <object-type name="QOpenGLFunctions_4_3_Compatibility" since="5.1"> + <object-type name="QOpenGLFunctions_4_3_Compatibility"> + &glgetv_includes; + &glgeti_v_includes; + &glgetv_modifications; + &glgeti_v_modifications; &opengl_modifications1_0; &opengl_modifications1_0_compat; &opengl_modifications1_1; @@ -324,7 +472,11 @@ &opengl_modifications4_1; &opengl_modifications4_3; </object-type> - <object-type name="QOpenGLFunctions_4_3_Core" since="5.1"> + <object-type name="QOpenGLFunctions_4_3_Core"> + &glgetv_includes; + &glgeti_v_includes; + &glgetv_modifications; + &glgeti_v_modifications; &opengl_modifications1_0; &opengl_modifications1_1; &opengl_modifications1_4; @@ -337,7 +489,11 @@ &opengl_modifications4_1; &opengl_modifications_va; </object-type> - <object-type name="QOpenGLFunctions_4_4_Compatibility" since="5.5"> + <object-type name="QOpenGLFunctions_4_4_Compatibility"> + &glgetv_includes; + &glgeti_v_includes; + &glgetv_modifications; + &glgeti_v_modifications; &opengl_modifications1_0; &opengl_modifications1_0_compat; &opengl_modifications1_1; @@ -358,7 +514,11 @@ &opengl_modifications4_4; &opengl_modifications4_4_core; </object-type> - <object-type name="QOpenGLFunctions_4_4_Core" since="5.5"> + <object-type name="QOpenGLFunctions_4_4_Core"> + &glgetv_includes; + &glgeti_v_includes; + &glgetv_modifications; + &glgeti_v_modifications; &opengl_modifications1_0; &opengl_modifications1_1; &opengl_modifications1_4; @@ -373,7 +533,11 @@ &opengl_modifications4_4; &opengl_modifications4_4_core; </object-type> - <object-type name="QOpenGLFunctions_4_5_Compatibility" since="5.5"> + <object-type name="QOpenGLFunctions_4_5_Compatibility"> + &glgetv_includes; + &glgeti_v_includes; + &glgetv_modifications; + &glgeti_v_modifications; &opengl_modifications1_0; &opengl_modifications1_0_compat; &opengl_modifications1_1; @@ -395,7 +559,11 @@ &opengl_modifications4_4_core; &opengl_modifications4_5; </object-type> - <object-type name="QOpenGLFunctions_4_5_Core" since="5.5"> + <object-type name="QOpenGLFunctions_4_5_Core"> + &glgetv_includes; + &glgeti_v_includes; + &glgetv_modifications; + &glgeti_v_modifications; &opengl_modifications1_0; &opengl_modifications1_1; &opengl_modifications1_4; @@ -411,39 +579,64 @@ &opengl_modifications4_5; &opengl_modifications_va; </object-type> - <object-type name="QOpenGLFunctions_ES2" since="5.1"> + <object-type name="QOpenGLFunctions_ES2"> &opengl_modifications1_0; &opengl_modifications1_1; </object-type> <object-type name="QOpenGLVersionFunctionsFactory"> + <extra-includes> + <include file-name="QtOpenGL/qopenglfunctions_1_0.h" location="global"/> + <include file-name="QtOpenGL/qopenglfunctions_1_1.h" location="global"/> + <include file-name="QtOpenGL/qopenglfunctions_1_2.h" location="global"/> + <include file-name="QtOpenGL/qopenglfunctions_1_3.h" location="global"/> + <include file-name="QtOpenGL/qopenglfunctions_1_4.h" location="global"/> + <include file-name="QtOpenGL/qopenglfunctions_1_5.h" location="global"/> + <include file-name="QtOpenGL/qopenglfunctions_2_0.h" location="global"/> + <include file-name="QtOpenGL/qopenglfunctions_2_1.h" location="global"/> + <include file-name="QtOpenGL/qopenglfunctions_3_0.h" location="global"/> + <include file-name="QtOpenGL/qopenglfunctions_3_1.h" location="global"/> + <include file-name="QtOpenGL/qopenglfunctions_3_2_compatibility.h" location="global"/> + <include file-name="QtOpenGL/qopenglfunctions_3_2_core.h" location="global"/> + <include file-name="QtOpenGL/qopenglfunctions_3_3_compatibility.h" location="global"/> + <include file-name="QtOpenGL/qopenglfunctions_3_3_core.h" location="global"/> + <include file-name="QtOpenGL/qopenglfunctions_4_0_compatibility.h" location="global"/> + <include file-name="QtOpenGL/qopenglfunctions_4_0_core.h" location="global"/> + <include file-name="QtOpenGL/qopenglfunctions_4_1_compatibility.h" location="global"/> + <include file-name="QtOpenGL/qopenglfunctions_4_1_core.h" location="global"/> + <include file-name="QtOpenGL/qopenglfunctions_4_2_compatibility.h" location="global"/> + <include file-name="QtOpenGL/qopenglfunctions_4_2_core.h" location="global"/> + <include file-name="QtOpenGL/qopenglfunctions_4_3_compatibility.h" location="global"/> + <include file-name="QtOpenGL/qopenglfunctions_4_3_core.h" location="global"/> + <include file-name="QtOpenGL/qopenglfunctions_4_4_compatibility.h" location="global"/> + <include file-name="QtOpenGL/qopenglfunctions_4_4_core.h" location="global"/> + <include file-name="QtOpenGL/qopenglfunctions_4_5_compatibility.h" location="global"/> + <include file-name="QtOpenGL/qopenglfunctions_4_5_core.h" location="global"/> + </extra-includes> <modify-function signature="get(const QOpenGLVersionProfile &,QOpenGLContext *)"> <inject-code class="target" position="beginning" file="../glue/qtopengl.cpp" snippet="qopenglversionfunctionsfactory-get"/> </modify-function> </object-type> - <object-type name="QOpenGLFramebufferObject" since="5.0"> + <object-type name="QOpenGLFramebufferObject"> <enum-type name="Attachment"/> - <enum-type name="FramebufferRestorePolicy" since="5.7"/> + <enum-type name="FramebufferRestorePolicy"/> </object-type> <value-type name="QOpenGLFramebufferObjectFormat"/> - <object-type name="QAbstractOpenGLFunctions" since="5.1"/> - <value-type name="QOpenGLPixelTransferOptions"/> - <object-type name="QOpenGLShader" since="5.0"> + <object-type name="QAbstractOpenGLFunctions"/> + <value-type name="QOpenGLPixelTransferOptions"/> + <object-type name="QOpenGLShader"> <enum-type name="ShaderTypeBit" flags="ShaderType"/> </object-type> <object-type name="QOpenGLPaintDevice"/> - <object-type name="QOpenGLShaderProgram" since="5.0"> + <object-type name="QOpenGLShaderProgram"> <modify-function signature="setAttributeArray(int,const float*,int,int)"> <modify-argument index="2"><array/></modify-argument> </modify-function> <modify-function signature="setAttributeArray(const char*,const float*,int,int)"> <modify-argument index="2"><array/></modify-argument> </modify-function> - <modify-function signature="setAttributeArray(int,const float*,int,int)"> - <modify-argument index="2"><array/></modify-argument> - </modify-function> <modify-function signature="setAttributeValue(int,const float*,int,int)"> <modify-argument index="2"><array/></modify-argument> </modify-function> @@ -453,19 +646,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 int*,int)"> + <modify-function signature="setUniformValueArray(int,const GLint*,int)"> <modify-argument index="2"><array/></modify-argument> </modify-function> - <modify-function signature="setUniformValueArray(int,const unsigned int*,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 int*,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 unsigned int*,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 --> @@ -474,17 +667,17 @@ <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*, int)" 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(int, 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(int, int)" 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> - <object-type name="QOpenGLTexture" since="5.2"> + <object-type name="QOpenGLTexture"> <enum-type name="BindingTarget"/> <enum-type name="CoordinateDirection"/> <enum-type name="ComparisonFunction"/> @@ -510,16 +703,21 @@ <object-type name="QOpenGLTextureBlitter"> <enum-type name="Origin"/> </object-type> - <object-type name="QOpenGLTimeMonitor" since="5.1"/> - <object-type name="QOpenGLTimerQuery" since="5.1"/> - <object-type name="QOpenGLWindow" since="5.4"> + <object-type name="QOpenGLTimeMonitor"/> + <object-type name="QOpenGLTimerQuery"/> + <object-type name="QOpenGLWindow"> <enum-type name="UpdateBehavior"/> </object-type> - <value-type name="QOpenGLVersionProfile" since="5.1"/> + <value-type name="QOpenGLVersionProfile"/> <object-type name="QOpenGLVertexArrayObject"> - <object-type name="Binder"/> + <object-type name="Binder"> + <add-function signature="__enter__()" return-type="QOpenGLVertexArrayObject::Binder"> + <inject-code file="../glue/qtopengl.cpp" snippet="vao-binder-enter"/> + </add-function> + <add-function signature="__exit__(PyObject*,PyObject*,PyObject*)"> + <inject-code file="../glue/qtopengl.cpp" snippet="vao-binder-exit"/> + </add-function> + </object-type> </object-type> - <suppress-warning text="^There's no user provided way.*QOpenGLFunctions_\d_\d.*::glIndex.*$"/> - </typesystem> diff --git a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications1_0.xml b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications1_0.xml index 5652ad6b6..152efad9e 100644 --- a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications1_0.xml +++ b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications1_0.xml @@ -1,42 +1,6 @@ <!-- -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt for Python. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2019 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 --> <modify-function signature="^glGetStringi?\(.*$"> <modify-argument index="return"> 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 5793048cd..a5f8ee77a 100644 --- a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications1_0_compat.xml +++ b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications1_0_compat.xml @@ -1,48 +1,12 @@ <!-- -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt for Python. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2019 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 --> <modify-function signature="^glBitmap\(.*$" remove="all"/> <modify-function signature="^glColor[34][a-z]{1,2}v\(.*$"> <modify-argument index="1"><array/></modify-argument> </modify-function> -<modify-function signature="glClipPlane(unsigned int,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_modifications1_1.xml b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications1_1.xml index 9383fb83f..1601a19c3 100644 --- a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications1_1.xml +++ b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications1_1.xml @@ -1,42 +1,6 @@ <!-- -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt for Python. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2019 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 --> <!-- Except glGenLists/glDeleteLists --> <modify-function signature="^glDelete[A-KM-Z].*s\(.*$"> diff --git a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications1_1_compat.xml b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications1_1_compat.xml index 3f8075b30..8e9293fd6 100644 --- a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications1_1_compat.xml +++ b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications1_1_compat.xml @@ -1,44 +1,11 @@ <!-- -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt for Python. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2019 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 --> <modify-function signature="^glPrioritizeTextures\(.*$"> <modify-argument index="2"><array/></modify-argument> <modify-argument index="3"><array/></modify-argument> </modify-function> +<modify-function signature="^glIndexubv\(.*$"> + <modify-argument index="1"><array/></modify-argument> +</modify-function> diff --git a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications1_2_compat.xml b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications1_2_compat.xml index c13b09b5b..58d395e3a 100644 --- a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications1_2_compat.xml +++ b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications1_2_compat.xml @@ -1,42 +1,6 @@ <!-- -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt for Python. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2019 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 --> <modify-function signature="^glColorTableParameter[fi]v\(.*$"> <modify-argument index="3"><array/></modify-argument> diff --git a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications1_3_compat.xml b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications1_3_compat.xml index e35f3b334..90903b33b 100644 --- a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications1_3_compat.xml +++ b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications1_3_compat.xml @@ -1,42 +1,6 @@ <!-- -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt for Python. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2019 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 --> <modify-function signature="^gl(Load|Mult)TransposeMatrix[df]\(.*$"> <modify-argument index="1"><array/></modify-argument> diff --git a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications1_4.xml b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications1_4.xml index 1102daea8..7cd5f74ea 100644 --- a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications1_4.xml +++ b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications1_4.xml @@ -1,42 +1,6 @@ <!-- -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt for Python. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2019 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 --> <modify-function signature="^glMultiDrawArrays\(.*$"> <modify-argument index="2"><array/></modify-argument> diff --git a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications1_4_compat.xml b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications1_4_compat.xml index 4cb75d418..56da84116 100644 --- a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications1_4_compat.xml +++ b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications1_4_compat.xml @@ -1,42 +1,6 @@ <!-- -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt for Python. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2019 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 --> <modify-function signature="^glFogCoord[df]v\(.*$"> <modify-argument index="1"><array/></modify-argument> diff --git a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications2_0.xml b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications2_0.xml index 28a424e1a..5b342087e 100644 --- a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications2_0.xml +++ b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications2_0.xml @@ -1,42 +1,6 @@ <!-- -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt for Python. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2019 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 --> <modify-function signature="^glDrawBuffers\(.*$"> <modify-argument index="2"><array/></modify-argument> diff --git a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications2_1.xml b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications2_1.xml index af515ed8c..741fbf7d8 100644 --- a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications2_1.xml +++ b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications2_1.xml @@ -1,42 +1,6 @@ <!-- -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt for Python. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2019 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 --> <modify-function signature="^glUniformMatrix\dx\d[a-z]v\(.*$"> <modify-argument index="4"><array/></modify-argument> diff --git a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications3_0.xml b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications3_0.xml index 8377e440b..782400768 100644 --- a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications3_0.xml +++ b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications3_0.xml @@ -1,42 +1,6 @@ <!-- -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt for Python. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2019 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 --> <modify-function signature="^glClearBufferu?[fi]v\(.*$"> <modify-argument index="3"><array/></modify-argument> diff --git a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications3_3.xml b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications3_3.xml index 7f4717170..c7e883b87 100644 --- a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications3_3.xml +++ b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications3_3.xml @@ -1,42 +1,6 @@ <!-- -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt for Python. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2019 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 --> <modify-function signature="^glSamplerParameterI?u?[dfi]v\(.*$"> <modify-argument index="3"><array/></modify-argument> diff --git a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications3_3a.xml b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications3_3a.xml index 4bf2bc8f5..95956d164 100644 --- a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications3_3a.xml +++ b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications3_3a.xml @@ -1,42 +1,6 @@ <!-- -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt for Python. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2019 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 Present from 3.3..4.5 except 4.4 Core/4.5 Core --> diff --git a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications4_0.xml b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications4_0.xml index cf2e47a5c..a66a74895 100644 --- a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications4_0.xml +++ b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications4_0.xml @@ -1,42 +1,6 @@ <!-- -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt for Python. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2019 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 --> <modify-function signature="^glPatchParameterfv\(.*$"> <modify-argument index="2"><array/></modify-argument> diff --git a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications4_1.xml b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications4_1.xml index bc92ce80d..0fb6cd49a 100644 --- a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications4_1.xml +++ b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications4_1.xml @@ -1,46 +1,28 @@ <!-- -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt for Python. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2019 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 --> <modify-function signature="^gl(DepthRange|Scissor|Viewport)Arrayv\(.*$"> <modify-argument index="3"><array/></modify-argument> </modify-function> +<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> + <modify-argument index="3"> + <remove-argument/> + </modify-argument> + <inject-code class="target" position="beginning" file="../glue/qtgui.cpp" snippet="qopenglextrafunctions-glgetdoublei-v"/> +</modify-function> +<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> + <modify-argument index="3"> + <remove-argument/> + </modify-argument> + <inject-code class="target" position="beginning" file="../glue/qtgui.cpp" snippet="qopenglextrafunctions-glgetfloati-v"/> +</modify-function> <modify-function signature="^glProgramUniform\du?[dfi]v\(.*$"> <modify-argument index="4"><array/></modify-argument> </modify-function> @@ -53,6 +35,6 @@ <modify-function signature="^gl(Scissor|Viewport)Indexedf?v\(.*$"> <modify-argument index="2"><array/></modify-argument> </modify-function> -<modify-function signature="glShaderBinary(int,const unsigned int*,unsigned int,const void *,int)"> +<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_3.xml b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications4_3.xml index b3c2b618d..74298677d 100644 --- a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications4_3.xml +++ b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications4_3.xml @@ -1,42 +1,6 @@ <!-- -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt for Python. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2019 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 --> <modify-function signature="^glInvalidate(Sub)?Framebuffer\(.*$"> <modify-argument index="3"><array/></modify-argument> diff --git a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications4_4.xml b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications4_4.xml index 6b59f174a..cf90e4e0b 100644 --- a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications4_4.xml +++ b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications4_4.xml @@ -1,52 +1,16 @@ <!-- -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt for Python. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2019 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 --> <modify-function signature="^glBindBuffersBase\(.*$"> <modify-argument index="4"><array/></modify-argument> </modify-function> -<modify-function signature="glBindBuffersRange(unsigned int, unsigned int,int,const unsigned int *,const long *,const long*)"> +<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(unsigned int,int,const unsigned int *,const long *,const int *)"> +<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_4_core.xml b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications4_4_core.xml index c747997aa..3f1291db7 100644 --- a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications4_4_core.xml +++ b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications4_4_core.xml @@ -1,42 +1,6 @@ <!-- -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt for Python. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2019 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 --> <modify-function signature="^glDebugMessageControl\(.*$"> <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 2ea0a458d..826727736 100644 --- a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications4_5.xml +++ b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications4_5.xml @@ -1,42 +1,6 @@ <!-- -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt for Python. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2019 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 --> <modify-function signature="^glClearNamedFramebufferu?[fi]v\(.*$"> <modify-argument index="4"><array/></modify-argument> @@ -50,7 +14,7 @@ <modify-function signature="^glTextureParameterI?u?[fi]v\(.*$"> <modify-argument index="3"><array/></modify-argument> </modify-function> -<modify-function signature="glVertexArrayVertexBuffers(unsigned int, unsigned int,int,const unsigned int *,const long *,const int *)"> +<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/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications4_5_core.xml b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications4_5_core.xml index 5cd5161f8..5b7c30fe5 100644 --- a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications4_5_core.xml +++ b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications4_5_core.xml @@ -1,41 +1,5 @@ <!-- -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt for Python. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2019 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 Remove me! --> diff --git a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications_va.xml b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications_va.xml index ae4d49ab1..624281645 100644 --- a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications_va.xml +++ b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications_va.xml @@ -1,42 +1,6 @@ <!-- -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt for Python. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2019 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 --> <modify-function signature="^glVertexAttrib[IL]?\dN?u?[bdfis]v\(.*$"> <modify-argument index="2"><array/></modify-argument> |