diff options
Diffstat (limited to 'sources/pyside2/PySide2/QtOpenGL/typesystem_opengl.xml')
| -rw-r--r-- | sources/pyside2/PySide2/QtOpenGL/typesystem_opengl.xml | 298 |
1 files changed, 122 insertions, 176 deletions
diff --git a/sources/pyside2/PySide2/QtOpenGL/typesystem_opengl.xml b/sources/pyside2/PySide2/QtOpenGL/typesystem_opengl.xml index ea5c24cd3..a234e95d6 100644 --- a/sources/pyside2/PySide2/QtOpenGL/typesystem_opengl.xml +++ b/sources/pyside2/PySide2/QtOpenGL/typesystem_opengl.xml @@ -41,6 +41,7 @@ --> <typesystem package="PySide2.QtOpenGL"> <load-typesystem name="QtWidgets/typesystem_widgets.xml" generate="no" /> + <load-typesystem name="templates/opengl_common.xml" generate="no" /> <primitive-type name="GLbitfield"/> <primitive-type name="GLboolean"/> @@ -59,19 +60,19 @@ <rejection class="QGLColormap::QGLColormapData"/> <rejection class="QGLContext" field-name="currentCtx"/> - <rejection class="^QGL.*$" argument-type="^GLboolean( const)?\*$"/> - <rejection class="^QGL.*$" argument-type="^GLchar( const)?\*$"/> - <rejection class="^QGL.*$" argument-type="GLchar *const const*"/> - <rejection class="^QGL.*$" argument-type="^GLenum( const)?\*$"/> - <rejection class="^QGL.*$" argument-type="^GLfloat( const)?\*$"/> - <rejection class="^QGL.*$" argument-type="^GLfloat( const)?\[.*$"/> - <rejection class="^QGL.*$" argument-type="^GLdouble( const)?\*$"/> + <rejection class="^QGL.*$" argument-type="^(const )?GLboolean ?\*$"/> + <rejection class="^QGL.*$" argument-type="^(const )?GLchar ?\*$"/> + <rejection class="^QGL.*$" argument-type="^(const )?GLchar ?\*const"/> + <rejection class="^QGL.*$" argument-type="^(const )?GLenum ?\*$"/> + <rejection class="^QGL.*$" argument-type="^(const )?GLfloat ?\*$"/> + <rejection class="^QGL.*$" argument-type="^(const )?GLfloat ?\[.*$"/> + <rejection class="^QGL.*$" argument-type="^(const )?GLdouble ?\*$"/> <rejection class="^QGL.*$" argument-type="GLintptr"/> - <rejection class="^QGL.*$" argument-type="^GLint64( const)?\*$"/> - <rejection class="^QGL.*$" argument-type="^GLsizei( const)?\*$"/> + <rejection class="^QGL.*$" argument-type="^(const )?GLint64 ?\*$"/> + <rejection class="^QGL.*$" argument-type="^(const )?GLsizei ?\*$"/> <namespace-type name="QGL"> - <enum-type name="FormatOption" flags="FormatOptions" force-integer="yes"/> + <enum-type name="FormatOption" flags="FormatOptions"/> <extra-includes> <include file-name="qgl.h" location="global"/> </extra-includes> @@ -88,7 +89,7 @@ <enum-type name="OpenGLVersionFlag" flags="OpenGLVersionFlags"/> </value-type> - <rejection class="QGLContext" field-name="currentCtx" /> + <rejection class="QGLContext" field-name="currentCtx"/> <object-type name="QGLContext"> <enum-type name="BindOption" flags="BindOptions" since="4.6"/> <modify-function signature="chooseContext(const QGLContext*)"> @@ -99,7 +100,7 @@ </modify-function> <!-- ### Obsolete functions and ctors --> - <modify-function signature="QGLContext(const QGLFormat&,QPaintDevice*)" remove="all" /> + <modify-function signature="QGLContext(const QGLFormat&,QPaintDevice*)" remove="all"/> <!-- ### --> </object-type> <object-type name="QGLFramebufferObject"> @@ -124,7 +125,7 @@ </modify-argument> </modify-function> <!-- ### Not part of Qt public API --> - <modify-function signature="setContext(QGLContext*,const QGLContext*,bool)" remove="all" /> + <modify-function signature="setContext(QGLContext*,const QGLContext*,bool)" remove="all"/> <!-- ### --> <!--- ### Obsolete functions --> <modify-function signature="setFormat(QGLFormat)" remove="all"/> @@ -136,34 +137,16 @@ <enum-type name="ShaderTypeBit" flags="ShaderType"/> </object-type> - <template name="callArrayFunction"> - int _size = PySequence_Size(%PYARG_2); - if (_size) { - $ATTR_TYPE *_list = new $ATTR_TYPE[_size]; - if (_size) { - Shiboken::AutoDecRef fast(PySequence_Fast(%PYARG_2, "Failed to parse sequence with type %VECTOR_TYPE.")); - for(int i=0; i < _size; i++) { - PyObject* pv = PySequence_Fast_GET_ITEM(fast.object(), i); - _list[i] = %CONVERTTOCPP[$ATTR_TYPE](pv); - } - } - %CPPSELF.%FUNCTION_NAME(%1, _list, $ARG0); - delete[] _list; - } else { - %CPPSELF.%FUNCTION_NAME(%1, ($ATTR_TYPE*)NULL, $ARG1); - } - </template> - <object-type name="QGLShaderProgram" since="4.6"> <!-- setAttributeArray --> <modify-function signature="setAttributeArray(int,const QVector2D*,int)" rename="setAttributeArray2D"> <modify-argument index="2" > - <replace-type modified-type="PySequence" /> + <replace-type modified-type="PySequence"/> </modify-argument> <inject-code> <insert-template name="callArrayFunction"> - <replace from="$ARG0" to="%3" /> - <replace from="$ARG1" to="%3" /> + <replace from="$ARG0" to="%3"/> + <replace from="$ARG1" to="%3"/> <replace from="$ATTR_TYPE" to="QVector2D"/> </insert-template> </inject-code> @@ -171,12 +154,12 @@ <modify-function signature="setAttributeArray(int,const QVector3D*,int)" rename="setAttributeArray3D"> <modify-argument index="2" > - <replace-type modified-type="PySequence" /> + <replace-type modified-type="PySequence"/> </modify-argument> <inject-code> <insert-template name="callArrayFunction"> - <replace from="$ARG0" to="%3" /> - <replace from="$ARG1" to="%3" /> + <replace from="$ARG0" to="%3"/> + <replace from="$ARG1" to="%3"/> <replace from="$ATTR_TYPE" to="QVector3D"/> </insert-template> </inject-code> @@ -184,12 +167,12 @@ <modify-function signature="setAttributeArray(int,const QVector4D*,int)" rename="setAttributeArray4D"> <modify-argument index="2" > - <replace-type modified-type="PySequence" /> + <replace-type modified-type="PySequence"/> </modify-argument> <inject-code> <insert-template name="callArrayFunction"> - <replace from="$ARG0" to="%3" /> - <replace from="$ARG1" to="%3" /> + <replace from="$ARG0" to="%3"/> + <replace from="$ARG1" to="%3"/> <replace from="$ATTR_TYPE" to="QVector4D"/> </insert-template> </inject-code> @@ -197,12 +180,12 @@ <modify-function signature="setAttributeArray(const char*,const QVector2D*,int)" rename="setAttributeArray2D"> <modify-argument index="2" > - <replace-type modified-type="PySequence" /> + <replace-type modified-type="PySequence"/> </modify-argument> <inject-code> <insert-template name="callArrayFunction"> - <replace from="$ARG0" to="%3" /> - <replace from="$ARG1" to="%3" /> + <replace from="$ARG0" to="%3"/> + <replace from="$ARG1" to="%3"/> <replace from="$ATTR_TYPE" to="QVector2D"/> </insert-template> </inject-code> @@ -210,12 +193,12 @@ <modify-function signature="setAttributeArray(const char*,const QVector3D*,int)" rename="setAttributeArray3D"> <modify-argument index="2" > - <replace-type modified-type="PySequence" /> + <replace-type modified-type="PySequence"/> </modify-argument> <inject-code> <insert-template name="callArrayFunction"> - <replace from="$ARG0" to="%3" /> - <replace from="$ARG1" to="%3" /> + <replace from="$ARG0" to="%3"/> + <replace from="$ARG1" to="%3"/> <replace from="$ATTR_TYPE" to="QVector3D"/> </insert-template> </inject-code> @@ -223,12 +206,12 @@ <modify-function signature="setAttributeArray(const char*,const QVector4D*,int)" rename="setAttributeArray4D"> <modify-argument index="2" > - <replace-type modified-type="PySequence" /> + <replace-type modified-type="PySequence"/> </modify-argument> <inject-code> <insert-template name="callArrayFunction"> - <replace from="$ARG0" to="%3" /> - <replace from="$ARG1" to="%3" /> + <replace from="$ARG0" to="%3"/> + <replace from="$ARG1" to="%3"/> <replace from="$ATTR_TYPE" to="QVector4D"/> </insert-template> </inject-code> @@ -237,15 +220,15 @@ <!-- setUniformValueArray --> <modify-function signature="setUniformValueArray(int,const GLint*,int)" rename="setUniformValueArrayInt"> <modify-argument index="2" > - <replace-type modified-type="PySequence" /> + <replace-type modified-type="PySequence"/> </modify-argument> <modify-argument index="3"> <remove-argument /> </modify-argument> <inject-code> <insert-template name="callArrayFunction"> - <replace from="$ARG0" to="_size" /> - <replace from="$ARG1" to="0" /> + <replace from="$ARG0" to="_size"/> + <replace from="$ARG1" to="0"/> <replace from="$ATTR_TYPE" to="GLint"/> </insert-template> </inject-code> @@ -253,15 +236,15 @@ <modify-function signature="setUniformValueArray(int,const GLuint*,int)" rename="setUniformValueArrayUint"> <modify-argument index="2" > - <replace-type modified-type="PySequence" /> + <replace-type modified-type="PySequence"/> </modify-argument> <modify-argument index="3"> <remove-argument /> </modify-argument> <inject-code> <insert-template name="callArrayFunction"> - <replace from="$ARG0" to="_size" /> - <replace from="$ARG1" to="0" /> + <replace from="$ARG0" to="_size"/> + <replace from="$ARG1" to="0"/> <replace from="$ATTR_TYPE" to="GLuint"/> </insert-template> </inject-code> @@ -269,15 +252,15 @@ <modify-function signature="setUniformValueArray(int,const QVector2D*,int)" rename="setUniformValueArray2D"> <modify-argument index="2" > - <replace-type modified-type="PySequence" /> + <replace-type modified-type="PySequence"/> </modify-argument> <modify-argument index="3"> <remove-argument /> </modify-argument> <inject-code> <insert-template name="callArrayFunction"> - <replace from="$ARG0" to="_size" /> - <replace from="$ARG1" to="0" /> + <replace from="$ARG0" to="_size"/> + <replace from="$ARG1" to="0"/> <replace from="$ATTR_TYPE" to="QVector2D"/> </insert-template> </inject-code> @@ -285,15 +268,15 @@ <modify-function signature="setUniformValueArray(int,const QVector3D*,int)" rename="setUniformValueArray3D"> <modify-argument index="2" > - <replace-type modified-type="PySequence" /> + <replace-type modified-type="PySequence"/> </modify-argument> <modify-argument index="3"> <remove-argument /> </modify-argument> <inject-code> <insert-template name="callArrayFunction"> - <replace from="$ARG0" to="_size" /> - <replace from="$ARG1" to="0" /> + <replace from="$ARG0" to="_size"/> + <replace from="$ARG1" to="0"/> <replace from="$ATTR_TYPE" to="QVector3D"/> </insert-template> </inject-code> @@ -301,15 +284,15 @@ <modify-function signature="setUniformValueArray(int,const QVector4D*,int)" rename="setUniformValueArray4D"> <modify-argument index="2" > - <replace-type modified-type="PySequence" /> + <replace-type modified-type="PySequence"/> </modify-argument> <modify-argument index="3"> <remove-argument /> </modify-argument> <inject-code> <insert-template name="callArrayFunction"> - <replace from="$ARG0" to="_size" /> - <replace from="$ARG1" to="0" /> + <replace from="$ARG0" to="_size"/> + <replace from="$ARG1" to="0"/> <replace from="$ATTR_TYPE" to="QVector4D"/> </insert-template> </inject-code> @@ -317,15 +300,15 @@ <modify-function signature="setUniformValueArray(int,const QMatrix2x2*,int)" rename="setUniformValueArray2x2"> <modify-argument index="2" > - <replace-type modified-type="PySequence" /> + <replace-type modified-type="PySequence"/> </modify-argument> <modify-argument index="3"> <remove-argument /> </modify-argument> <inject-code> <insert-template name="callArrayFunction"> - <replace from="$ARG0" to="_size" /> - <replace from="$ARG1" to="0" /> + <replace from="$ARG0" to="_size"/> + <replace from="$ARG1" to="0"/> <replace from="$ATTR_TYPE" to="QMatrix2x2"/> </insert-template> </inject-code> @@ -333,15 +316,15 @@ <modify-function signature="setUniformValueArray(int,const QMatrix2x3*,int)" rename="setUniformValueArray2x3"> <modify-argument index="2" > - <replace-type modified-type="PySequence" /> + <replace-type modified-type="PySequence"/> </modify-argument> <modify-argument index="3"> <remove-argument /> </modify-argument> <inject-code> <insert-template name="callArrayFunction"> - <replace from="$ARG0" to="_size" /> - <replace from="$ARG1" to="0" /> + <replace from="$ARG0" to="_size"/> + <replace from="$ARG1" to="0"/> <replace from="$ATTR_TYPE" to="QMatrix2x3"/> </insert-template> </inject-code> @@ -349,15 +332,15 @@ <modify-function signature="setUniformValueArray(int,const QMatrix2x4*,int)" rename="setUniformValueArray2x4"> <modify-argument index="2" > - <replace-type modified-type="PySequence" /> + <replace-type modified-type="PySequence"/> </modify-argument> <modify-argument index="3"> <remove-argument /> </modify-argument> <inject-code> <insert-template name="callArrayFunction"> - <replace from="$ARG0" to="_size" /> - <replace from="$ARG1" to="0" /> + <replace from="$ARG0" to="_size"/> + <replace from="$ARG1" to="0"/> <replace from="$ATTR_TYPE" to="QMatrix2x4"/> </insert-template> </inject-code> @@ -365,15 +348,15 @@ <modify-function signature="setUniformValueArray(int,const QMatrix3x2*,int)" rename="setUniformValueArray3x2"> <modify-argument index="2" > - <replace-type modified-type="PySequence" /> + <replace-type modified-type="PySequence"/> </modify-argument> <modify-argument index="3"> <remove-argument /> </modify-argument> <inject-code> <insert-template name="callArrayFunction"> - <replace from="$ARG0" to="_size" /> - <replace from="$ARG1" to="0" /> + <replace from="$ARG0" to="_size"/> + <replace from="$ARG1" to="0"/> <replace from="$ATTR_TYPE" to="QMatrix3x2"/> </insert-template> </inject-code> @@ -381,15 +364,15 @@ <modify-function signature="setUniformValueArray(int,const QMatrix3x3*,int)" rename="setUniformValueArray3x3"> <modify-argument index="2" > - <replace-type modified-type="PySequence" /> + <replace-type modified-type="PySequence"/> </modify-argument> <modify-argument index="3"> <remove-argument /> </modify-argument> <inject-code> <insert-template name="callArrayFunction"> - <replace from="$ARG0" to="_size" /> - <replace from="$ARG1" to="0" /> + <replace from="$ARG0" to="_size"/> + <replace from="$ARG1" to="0"/> <replace from="$ATTR_TYPE" to="QMatrix3x3"/> </insert-template> </inject-code> @@ -397,15 +380,15 @@ <modify-function signature="setUniformValueArray(int,const QMatrix3x4*,int)" rename="setUniformValueArray3x4"> <modify-argument index="2" > - <replace-type modified-type="PySequence" /> + <replace-type modified-type="PySequence"/> </modify-argument> <modify-argument index="3"> <remove-argument /> </modify-argument> <inject-code> <insert-template name="callArrayFunction"> - <replace from="$ARG0" to="_size" /> - <replace from="$ARG1" to="0" /> + <replace from="$ARG0" to="_size"/> + <replace from="$ARG1" to="0"/> <replace from="$ATTR_TYPE" to="QMatrix3x4"/> </insert-template> </inject-code> @@ -413,15 +396,15 @@ <modify-function signature="setUniformValueArray(int,const QMatrix4x2*,int)" rename="setUniformValueArray4x2"> <modify-argument index="2" > - <replace-type modified-type="PySequence" /> + <replace-type modified-type="PySequence"/> </modify-argument> <modify-argument index="3"> <remove-argument /> </modify-argument> <inject-code> <insert-template name="callArrayFunction"> - <replace from="$ARG0" to="_size" /> - <replace from="$ARG1" to="0" /> + <replace from="$ARG0" to="_size"/> + <replace from="$ARG1" to="0"/> <replace from="$ATTR_TYPE" to="QMatrix4x2"/> </insert-template> </inject-code> @@ -429,15 +412,15 @@ <modify-function signature="setUniformValueArray(int,const QMatrix4x3*,int)" rename="setUniformValueArray4x3"> <modify-argument index="2" > - <replace-type modified-type="PySequence" /> + <replace-type modified-type="PySequence"/> </modify-argument> <modify-argument index="3"> <remove-argument /> </modify-argument> <inject-code> <insert-template name="callArrayFunction"> - <replace from="$ARG0" to="_size" /> - <replace from="$ARG1" to="0" /> + <replace from="$ARG0" to="_size"/> + <replace from="$ARG1" to="0"/> <replace from="$ATTR_TYPE" to="QMatrix4x3"/> </insert-template> </inject-code> @@ -445,15 +428,15 @@ <modify-function signature="setUniformValueArray(int,const QMatrix4x4*,int)" rename="setUniformValueArray4x4"> <modify-argument index="2" > - <replace-type modified-type="PySequence" /> + <replace-type modified-type="PySequence"/> </modify-argument> <modify-argument index="3"> <remove-argument /> </modify-argument> <inject-code> <insert-template name="callArrayFunction"> - <replace from="$ARG0" to="_size" /> - <replace from="$ARG1" to="0" /> + <replace from="$ARG0" to="_size"/> + <replace from="$ARG1" to="0"/> <replace from="$ATTR_TYPE" to="QMatrix4x4"/> </insert-template> </inject-code> @@ -461,15 +444,15 @@ <modify-function signature="setUniformValueArray(const char*,const GLint*,int)" rename="setUniformValueArrayInt"> <modify-argument index="2" > - <replace-type modified-type="PySequence" /> + <replace-type modified-type="PySequence"/> </modify-argument> <modify-argument index="3"> <remove-argument /> </modify-argument> <inject-code> <insert-template name="callArrayFunction"> - <replace from="$ARG0" to="_size" /> - <replace from="$ARG1" to="0" /> + <replace from="$ARG0" to="_size"/> + <replace from="$ARG1" to="0"/> <replace from="$ATTR_TYPE" to="GLint"/> </insert-template> </inject-code> @@ -477,15 +460,15 @@ <modify-function signature="setUniformValueArray(const char*,const GLuint*,int)" rename="setUniformValueArrayUint"> <modify-argument index="2" > - <replace-type modified-type="PySequence" /> + <replace-type modified-type="PySequence"/> </modify-argument> <modify-argument index="3"> <remove-argument /> </modify-argument> <inject-code> <insert-template name="callArrayFunction"> - <replace from="$ARG0" to="_size" /> - <replace from="$ARG1" to="0" /> + <replace from="$ARG0" to="_size"/> + <replace from="$ARG1" to="0"/> <replace from="$ATTR_TYPE" to="GLuint"/> </insert-template> </inject-code> @@ -493,15 +476,15 @@ <modify-function signature="setUniformValueArray(const char*,const QVector2D*,int)" rename="setUniformValueArray2D"> <modify-argument index="2" > - <replace-type modified-type="PySequence" /> + <replace-type modified-type="PySequence"/> </modify-argument> <modify-argument index="3"> <remove-argument /> </modify-argument> <inject-code> <insert-template name="callArrayFunction"> - <replace from="$ARG0" to="_size" /> - <replace from="$ARG1" to="0" /> + <replace from="$ARG0" to="_size"/> + <replace from="$ARG1" to="0"/> <replace from="$ATTR_TYPE" to="QVector2D"/> </insert-template> </inject-code> @@ -509,15 +492,15 @@ <modify-function signature="setUniformValueArray(const char*,const QVector3D*,int)" rename="setUniformValueArray3D"> <modify-argument index="2" > - <replace-type modified-type="PySequence" /> + <replace-type modified-type="PySequence"/> </modify-argument> <modify-argument index="3"> <remove-argument /> </modify-argument> <inject-code> <insert-template name="callArrayFunction"> - <replace from="$ARG0" to="_size" /> - <replace from="$ARG1" to="0" /> + <replace from="$ARG0" to="_size"/> + <replace from="$ARG1" to="0"/> <replace from="$ATTR_TYPE" to="QVector3D"/> </insert-template> </inject-code> @@ -525,15 +508,15 @@ <modify-function signature="setUniformValueArray(const char*,const QVector4D*,int)" rename="setUniformValueArray4D"> <modify-argument index="2" > - <replace-type modified-type="PySequence" /> + <replace-type modified-type="PySequence"/> </modify-argument> <modify-argument index="3"> <remove-argument /> </modify-argument> <inject-code> <insert-template name="callArrayFunction"> - <replace from="$ARG0" to="_size" /> - <replace from="$ARG1" to="0" /> + <replace from="$ARG0" to="_size"/> + <replace from="$ARG1" to="0"/> <replace from="$ATTR_TYPE" to="QVector4D"/> </insert-template> </inject-code> @@ -541,15 +524,15 @@ <modify-function signature="setUniformValueArray(const char*,const QMatrix2x2*,int)" rename="setUniformValueArray2x2"> <modify-argument index="2" > - <replace-type modified-type="PySequence" /> + <replace-type modified-type="PySequence"/> </modify-argument> <modify-argument index="3"> <remove-argument /> </modify-argument> <inject-code> <insert-template name="callArrayFunction"> - <replace from="$ARG0" to="_size" /> - <replace from="$ARG1" to="0" /> + <replace from="$ARG0" to="_size"/> + <replace from="$ARG1" to="0"/> <replace from="$ATTR_TYPE" to="QMatrix2x2"/> </insert-template> </inject-code> @@ -557,15 +540,15 @@ <modify-function signature="setUniformValueArray(const char*,const QMatrix2x3*,int)" rename="setUniformValueArray2x3"> <modify-argument index="2" > - <replace-type modified-type="PySequence" /> + <replace-type modified-type="PySequence"/> </modify-argument> <modify-argument index="3"> <remove-argument /> </modify-argument> <inject-code> <insert-template name="callArrayFunction"> - <replace from="$ARG0" to="_size" /> - <replace from="$ARG1" to="0" /> + <replace from="$ARG0" to="_size"/> + <replace from="$ARG1" to="0"/> <replace from="$ATTR_TYPE" to="QMatrix2x3"/> </insert-template> </inject-code> @@ -573,15 +556,15 @@ <modify-function signature="setUniformValueArray(const char*,const QMatrix2x4*,int)" rename="setUniformValueArray2x4"> <modify-argument index="2" > - <replace-type modified-type="PySequence" /> + <replace-type modified-type="PySequence"/> </modify-argument> <modify-argument index="3"> <remove-argument /> </modify-argument> <inject-code> <insert-template name="callArrayFunction"> - <replace from="$ARG0" to="_size" /> - <replace from="$ARG1" to="0" /> + <replace from="$ARG0" to="_size"/> + <replace from="$ARG1" to="0"/> <replace from="$ATTR_TYPE" to="QMatrix2x4"/> </insert-template> </inject-code> @@ -589,15 +572,15 @@ <modify-function signature="setUniformValueArray(const char*,const QMatrix3x2*,int)" rename="setUniformValueArray3x2"> <modify-argument index="2" > - <replace-type modified-type="PySequence" /> + <replace-type modified-type="PySequence"/> </modify-argument> <modify-argument index="3"> <remove-argument /> </modify-argument> <inject-code> <insert-template name="callArrayFunction"> - <replace from="$ARG0" to="_size" /> - <replace from="$ARG1" to="0" /> + <replace from="$ARG0" to="_size"/> + <replace from="$ARG1" to="0"/> <replace from="$ATTR_TYPE" to="QMatrix3x2"/> </insert-template> </inject-code> @@ -605,15 +588,15 @@ <modify-function signature="setUniformValueArray(const char*,const QMatrix3x3*,int)" rename="setUniformValueArray3x3"> <modify-argument index="2" > - <replace-type modified-type="PySequence" /> + <replace-type modified-type="PySequence"/> </modify-argument> <modify-argument index="3"> <remove-argument /> </modify-argument> <inject-code> <insert-template name="callArrayFunction"> - <replace from="$ARG0" to="_size" /> - <replace from="$ARG1" to="0" /> + <replace from="$ARG0" to="_size"/> + <replace from="$ARG1" to="0"/> <replace from="$ATTR_TYPE" to="QMatrix3x3"/> </insert-template> </inject-code> @@ -621,15 +604,15 @@ <modify-function signature="setUniformValueArray(const char*,const QMatrix3x4*,int)" rename="setUniformValueArray3x4"> <modify-argument index="2" > - <replace-type modified-type="PySequence" /> + <replace-type modified-type="PySequence"/> </modify-argument> <modify-argument index="3"> <remove-argument /> </modify-argument> <inject-code> <insert-template name="callArrayFunction"> - <replace from="$ARG0" to="_size" /> - <replace from="$ARG1" to="0" /> + <replace from="$ARG0" to="_size"/> + <replace from="$ARG1" to="0"/> <replace from="$ATTR_TYPE" to="QMatrix3x4"/> </insert-template> </inject-code> @@ -637,15 +620,15 @@ <modify-function signature="setUniformValueArray(const char*,const QMatrix4x2*,int)" rename="setUniformValueArray4x2"> <modify-argument index="2" > - <replace-type modified-type="PySequence" /> + <replace-type modified-type="PySequence"/> </modify-argument> <modify-argument index="3"> <remove-argument /> </modify-argument> <inject-code> <insert-template name="callArrayFunction"> - <replace from="$ARG0" to="_size" /> - <replace from="$ARG1" to="0" /> + <replace from="$ARG0" to="_size"/> + <replace from="$ARG1" to="0"/> <replace from="$ATTR_TYPE" to="QMatrix4x2"/> </insert-template> </inject-code> @@ -653,15 +636,15 @@ <modify-function signature="setUniformValueArray(const char*,const QMatrix4x3*,int)" rename="setUniformValueArray4x3"> <modify-argument index="2" > - <replace-type modified-type="PySequence" /> + <replace-type modified-type="PySequence"/> </modify-argument> <modify-argument index="3"> <remove-argument /> </modify-argument> <inject-code> <insert-template name="callArrayFunction"> - <replace from="$ARG0" to="_size" /> - <replace from="$ARG1" to="0" /> + <replace from="$ARG0" to="_size"/> + <replace from="$ARG1" to="0"/> <replace from="$ATTR_TYPE" to="QMatrix4x3"/> </insert-template> </inject-code> @@ -669,32 +652,23 @@ <modify-function signature="setUniformValueArray(const char*,const QMatrix4x4*,int)" rename="setUniformValueArray4x4"> <modify-argument index="2" > - <replace-type modified-type="PySequence" /> + <replace-type modified-type="PySequence"/> </modify-argument> <modify-argument index="3"> <remove-argument /> </modify-argument> <inject-code> <insert-template name="callArrayFunction"> - <replace from="$ARG0" to="_size" /> - <replace from="$ARG1" to="0" /> + <replace from="$ARG0" to="_size"/> + <replace from="$ARG1" to="0"/> <replace from="$ATTR_TYPE" to="QMatrix4x4"/> </insert-template> </inject-code> </modify-function> - <!-- ### TODO: must evaluate if anything other than removal should be done. --> - <modify-function signature="setAttributeArray(int,const GLfloat*,int,int)" remove="all" /> - <modify-function signature="setAttributeArray(const char*,const GLfloat*,int,int)" remove="all" /> - <modify-function signature="setUniformValueArray(int,const GLfloat*,int,int)" remove="all" /> - <modify-function signature="setUniformValueArray(const char*,const GLfloat*,int,int)" remove="all" /> - <!-- ### --> - <!-- ### Use QMatrixZxY overloads --> - <modify-function signature="setAttributeValue(int,const GLfloat*,int,int)" remove="all" /> - <modify-function signature="setAttributeValue(const char*,const GLfloat*,int,int)" remove="all" /> - <modify-function signature="setAttributeArray(int,GLenum,const void*,int,int)" remove="all" since="4.7" /> - <modify-function signature="setAttributeArray(const char*,GLenum,const void*,int,int)" remove="all" since="4.7" /> + <modify-function signature="setAttributeArray(int,GLenum,const void*,int,int)" remove="all" since="4.7"/> + <modify-function signature="setAttributeArray(const char*,GLenum,const void*,int,int)" remove="all" since="4.7"/> <!-- ### --> </object-type> @@ -710,25 +684,10 @@ <modify-argument index="2"> <replace-default-expression with="-1"/> </modify-argument> - <inject-code class="target" position="beginning"> - int size = (%2 < 0) ? %1.size() : %2; - %CPPSELF.allocate((const void*) %1.data(), size); - </inject-code> + <inject-code class="target" position="beginning" file="../glue/qtopengl.cpp" snippet="qglbuffer-allocate"/> </modify-function> <modify-function signature="map(QGLBuffer::Access)"> - <inject-code> - Py_ssize_t dataSize = %CPPSELF.size(); - void* data = %CPPSELF.map(%1); - - if (!data) { - Py_INCREF(Py_None); - %PYARG_0 = Py_None; - } else if (%1 == QGLBuffer::ReadOnly) { - %PYARG_0 = Shiboken::Buffer::newObject(data, dataSize, Shiboken::Buffer::ReadOnly); - } else { - %PYARG_0 = Shiboken::Buffer::newObject(data, dataSize, Shiboken::Buffer::ReadWrite); - } - </inject-code> + <inject-code file="../glue/qtopengl.cpp" snippet="qglbuffer-map"/> </modify-function> <modify-function signature="read(int,void*,int)"> <modify-argument index="2"> @@ -737,17 +696,7 @@ <modify-argument index="return"> <replace-type modified-type="(retval, data)"/> </modify-argument> - <inject-code class="target" position="beginning"> - char *data = new char[%3]; - bool result = %CPPSELF.read(%1, data, %3); - QByteArray ret; - if (result) - ret.append((const char*)data, %3); - %PYARG_0 = PyTuple_New(2); - PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[bool](result)); - PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[QByteArray](ret)); - delete[] data; - </inject-code> + <inject-code class="target" position="beginning" file="../glue/qtopengl.cpp" snippet="qglbuffer-read"/> </modify-function> <modify-function signature="write(int,const void*,int)"> <modify-argument index="2"> @@ -756,10 +705,7 @@ <modify-argument index="3"> <replace-default-expression with="-1"/> </modify-argument> - <inject-code class="target" position="beginning"> - int size = (%3 < 0) ? %2.size() : %3; - %CPPSELF.write(%1, (const void*) %2.data(), size); - </inject-code> + <inject-code class="target" position="beginning" file="../glue/qtopengl.cpp" snippet="qglbuffer-write"/> </modify-function> </object-type> |