diff options
| author | Martijn Berger <mberger@denc.com> | 2015-08-03 13:19:20 +0300 |
|---|---|---|
| committer | Martijn Berger <mberger@denc.com> | 2015-08-03 13:20:08 +0300 |
| commit | 230d93ad542cd38c458590b7888961b7948f1a89 (patch) | |
| tree | 617d8b491f24a579a45955497157ce7add4e4572 /source | |
| parent | 42d65ef5cc9bd4b9c398957efc95828ec0f63e49 (diff) | |
Fix bgl so that get-methods that take a string use strings instead of bgl buffer objects again
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/python/generic/bgl.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/source/blender/python/generic/bgl.c b/source/blender/python/generic/bgl.c index 8682b860fe3..e949972220b 100644 --- a/source/blender/python/generic/bgl.c +++ b/source/blender/python/generic/bgl.c @@ -262,12 +262,10 @@ #define GLfloat_def(num) float GLfloat_var(num) /* typedef char *GLstring; */ -#if 0 #define GLstring_str "s" #define GLstring_var(number) bgl_var##number #define GLstring_ref(number) &bgl_var##number #define GLstring_def(number) char *GLstring_var(number) -#endif /* typedef float GLclampf; */ #if 0 @@ -1456,7 +1454,7 @@ BGL_Wrap(UnmapBuffer, GLboolean, (GLenum)) /* GL_VERSION_2_0 */ BGL_Wrap(AttachShader, void, (GLuint, GLuint)) -BGL_Wrap(BindAttribLocation, void, (GLuint, GLuint, GLcharP)) +BGL_Wrap(BindAttribLocation, void, (GLuint, GLuint, GLstring)) BGL_Wrap(BlendEquationSeparate, void, (GLenum, GLenum)) BGL_Wrap(CompileShader, void, (GLuint)) BGL_Wrap(CreateProgram, GLuint, (void)) @@ -1470,13 +1468,13 @@ BGL_Wrap(EnableVertexAttribArray, void, (GLuint)) BGL_Wrap(GetActiveAttrib, void, (GLuint, GLuint, GLsizei, GLsizeiP, GLintP, GLenumP, GLcharP)) BGL_Wrap(GetActiveUniform, void, (GLuint, GLuint, GLsizei, GLsizeiP, GLintP, GLenumP, GLcharP)) BGL_Wrap(GetAttachedShaders, void, (GLuint, GLsizei, GLsizeiP, GLuintP)) -BGL_Wrap(GetAttribLocation, GLint, (GLuint, GLcharP)) +BGL_Wrap(GetAttribLocation, GLint, (GLuint, GLstring)) BGL_Wrap(GetProgramInfoLog, void, (GLuint, GLsizei, GLsizeiP, GLcharP)) BGL_Wrap(GetProgramiv, void, (GLuint, GLenum, GLintP)) BGL_Wrap(GetShaderInfoLog, void, (GLuint, GLsizei, GLsizeiP, GLcharP)) BGL_Wrap(GetShaderSource, void, (GLuint, GLsizei, GLsizeiP, GLcharP)) BGL_Wrap(GetShaderiv, void, (GLuint, GLenum, GLintP)) -BGL_Wrap(GetUniformLocation, GLint, (GLuint, GLcharP)) +BGL_Wrap(GetUniformLocation, GLint, (GLuint, GLstring)) BGL_Wrap(GetUniformfv, void, (GLuint, GLint, GLfloatP)) BGL_Wrap(GetUniformiv, void, (GLuint, GLint, GLintP)) BGL_Wrap(GetVertexAttribPointerv, void, (GLuint, GLenum, GLvoidP)) @@ -1573,7 +1571,7 @@ BGL_Wrap(GetActiveUniformBlockiv, void, (GLuint, GLuint, GLenum, GLintP)) BGL_Wrap(GetActiveUniformName, void, (GLuint, GLuint, GLsizei, GLsizeiP, GLcharP)) BGL_Wrap(GetActiveUniformsiv, void, (GLuint, GLsizei, GLuintP, GLenum, GLintP)) BGL_Wrap(GetIntegeri_v, void, (GLenum, GLuint, GLintP)) -BGL_Wrap(GetUniformBlockIndex, GLuint, (GLuint, GLcharP)) +BGL_Wrap(GetUniformBlockIndex, GLuint, (GLuint, GLstring)) BGL_Wrap(GetUniformIndices, void, (GLuint, GLsizei, GLcharP, GLuintP)) BGL_Wrap(UniformBlockBinding, void, (GLuint, GLuint, GLuint)) |