summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcelo Lira <marcelo.lira@openbossa.org>2011-12-12 20:02:38 -0300
committerMarcelo Lira <marcelo.lira@openbossa.org>2011-12-12 20:17:48 -0300
commit72edc8be877cf77ec54882691950fb2df5ec0e0b (patch)
tree22de3c74cc5abe94767d5bc6be4cbe930024ce3c
parentfe16e86ada6a7ce2b69073d94a20bf56e9e7377b (diff)
downloadpyside-72edc8be877cf77ec54882691950fb2df5ec0e0b.tar.gz
pyside-72edc8be877cf77ec54882691950fb2df5ec0e0b.tar.xz
pyside-72edc8be877cf77ec54882691950fb2df5ec0e0b.zip
Added type system entries to the primitive types used by QtOpenGL.
-rw-r--r--PySide/QtOpenGL/typesystem_opengl.xml39
1 files changed, 27 insertions, 12 deletions
diff --git a/PySide/QtOpenGL/typesystem_opengl.xml b/PySide/QtOpenGL/typesystem_opengl.xml
index 4c2604a..60a2d18 100644
--- a/PySide/QtOpenGL/typesystem_opengl.xml
+++ b/PySide/QtOpenGL/typesystem_opengl.xml
@@ -21,6 +21,21 @@
<typesystem package="PySide.QtOpenGL">
<load-typesystem name="typesystem_gui.xml" generate="no" />
+ <primitive-type name="GLbitfield"/>
+ <primitive-type name="GLboolean"/>
+ <primitive-type name="GLbyte"/>
+ <primitive-type name="GLclampd"/>
+ <primitive-type name="GLclampf"/>
+ <primitive-type name="GLdouble"/>
+ <primitive-type name="GLenum"/>
+ <primitive-type name="GLfloat"/>
+ <primitive-type name="GLint"/>
+ <primitive-type name="GLshort"/>
+ <primitive-type name="GLsizei"/>
+ <primitive-type name="GLubyte"/>
+ <primitive-type name="GLuint"/>
+ <primitive-type name="GLushort"/>
+
<rejection class="QGLColormap::QGLColormapData"/>
<rejection class="QGLContext" field-name="currentCtx"/>
@@ -191,7 +206,7 @@
</modify-function>
<!-- setUniformValueArray -->
- <modify-function signature="setUniformValueArray(int, const int*, int)" rename="setUniformValueArrayInt">
+ <modify-function signature="setUniformValueArray(int, const GLint*, int)" rename="setUniformValueArrayInt">
<modify-argument index="2" >
<replace-type modified-type="PySequence" />
</modify-argument>
@@ -207,7 +222,7 @@
</inject-code>
</modify-function>
- <modify-function signature="setUniformValueArray(int, const uint*, int)" rename="setUniformValueArrayUint">
+ <modify-function signature="setUniformValueArray(int, const GLuint*, int)" rename="setUniformValueArrayUint">
<modify-argument index="2" >
<replace-type modified-type="PySequence" />
</modify-argument>
@@ -415,7 +430,7 @@
</inject-code>
</modify-function>
- <modify-function signature="setUniformValueArray(const char*, const int*, int)" rename="setUniformValueArrayInt">
+ <modify-function signature="setUniformValueArray(const char*, const GLint*, int)" rename="setUniformValueArrayInt">
<modify-argument index="2" >
<replace-type modified-type="PySequence" />
</modify-argument>
@@ -431,7 +446,7 @@
</inject-code>
</modify-function>
- <modify-function signature="setUniformValueArray(const char*, const uint*, int)" rename="setUniformValueArrayUint">
+ <modify-function signature="setUniformValueArray(const char*, const GLuint*, int)" rename="setUniformValueArrayUint">
<modify-argument index="2" >
<replace-type modified-type="PySequence" />
</modify-argument>
@@ -640,19 +655,19 @@
</modify-function>
<!-- ### TODO: must evaluate if anything other than removal should be done. -->
- <modify-function signature="setAttributeArray(int,const float*,int,int)" remove="all" />
- <modify-function signature="setAttributeArray(const char*,const float*,int,int)" remove="all" />
- <modify-function signature="setUniformValueArray(int,const float*,int,int)" remove="all" />
- <modify-function signature="setUniformValueArray(const char*,const float*,int,int)" remove="all" />
+ <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="setUniformValue(int,Array)" remove="all" />
<modify-function signature="setUniformValue(const char*,Array)" remove="all" />
- <modify-function signature="setAttributeValue(int,const float*,int,int)" remove="all" />
- <modify-function signature="setAttributeValue(const char*,const float*,int,int)" remove="all" />
- <modify-function signature="setAttributeArray(int, uint, const void*, int, int)" remove="all" since="4.7" />
- <modify-function signature="setAttributeArray(const char*, uint, const void*, int, int)" remove="all" since="4.7" />
+ <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" />
<!-- ### -->
</object-type>