Fix OpenGL extension report in system info operator.
authorAntony Riakiotakis <kalast@gmail.com>
Mon, 23 Oct 2017 19:22:22 +0000 (22:22 +0300)
committerAntony Riakiotakis <kalast@gmail.com>
Mon, 23 Oct 2017 19:22:22 +0000 (22:22 +0300)
release/scripts/modules/sys_info.py
source/blender/python/generic/bgl.c

index e447d8a4dc58f31dff90c682dd26ef7271f459bb..53b3197fca33a6db0c236d8fea38e64ac2cbc868 100644 (file)
@@ -185,14 +185,19 @@ def write_sysinfo(filepath):
                 output.write("version:\t%r\n" % (bgl.glGetString(bgl.GL_VERSION)))
                 output.write("extensions:\n")
 
-                glext = sorted(bgl.glGetString(bgl.GL_EXTENSIONS).split())
+                limit = bgl.Buffer(bgl.GL_INT, 1)
+                bgl.glGetIntegerv(bgl.GL_NUM_EXTENSIONS, limit)
+
+                glext = []
+                for i in range(limit[0]):
+                    glext.append(bgl.glGetStringi(bgl.GL_EXTENSIONS, i))
+
+                glext = sorted(glext)
+
                 for l in glext:
                     output.write("\t%s\n" % l)
 
                 output.write(title("Implementation Dependent OpenGL Limits"))
-                limit = bgl.Buffer(bgl.GL_INT, 1)
-                bgl.glGetIntegerv(bgl.GL_MAX_TEXTURE_UNITS, limit)
-                output.write("Maximum Fixed Function Texture Units:\t%d\n" % limit[0])
                 bgl.glGetIntegerv(bgl.GL_MAX_ELEMENTS_VERTICES, limit)
                 output.write("Maximum DrawElements Vertices:\t%d\n" % limit[0])
                 bgl.glGetIntegerv(bgl.GL_MAX_ELEMENTS_INDICES, limit)
index 9672b824843d1cf967fd0bc57db95b4e9f78a9ee..827b69f5403492a275275e2c13211e308611a210 100644 (file)
@@ -1298,6 +1298,7 @@ BGL_Wrap(UniformMatrix4x3fv,        void,      (GLint, GLsizei, GLboolean, GLflo
 BGL_Wrap(BindVertexArray,           void,      (GLuint))
 BGL_Wrap(DeleteVertexArrays,        void,      (GLsizei, GLuintP))
 BGL_Wrap(GenVertexArrays,           void,      (GLsizei, GLuintP))
+BGL_Wrap(GetStringi,                GLstring,  (GLenum, GLuint))
 BGL_Wrap(IsVertexArray,             GLboolean, (GLuint))
 
 
@@ -1628,6 +1629,7 @@ PyObject *BPyInit_bgl(void)
                PY_MOD_ADD_METHOD(BindVertexArray);
                PY_MOD_ADD_METHOD(DeleteVertexArrays);
                PY_MOD_ADD_METHOD(GenVertexArrays);
+               PY_MOD_ADD_METHOD(GetStringi);
                PY_MOD_ADD_METHOD(IsVertexArray);
        }