[Bf-blender-cvs] [85945a8] master: Add debug information for maximum opengl limits in system info generation.

Antony Riakiotakis noreply at git.blender.org
Thu Aug 28 12:20:18 CEST 2014


Commit: 85945a8b862dc7ff5a8938959242e08da5e1cadc
Author: Antony Riakiotakis
Date:   Thu Aug 28 12:19:44 2014 +0200
Branches: master
https://developer.blender.org/rB85945a8b862dc7ff5a8938959242e08da5e1cadc

Add debug information for maximum opengl limits in system info
generation.

===================================================================

M	release/scripts/modules/sys_info.py
M	source/blender/python/generic/bgl.c

===================================================================

diff --git a/release/scripts/modules/sys_info.py b/release/scripts/modules/sys_info.py
index f87cf61..7fd97c4 100644
--- a/release/scripts/modules/sys_info.py
+++ b/release/scripts/modules/sys_info.py
@@ -153,7 +153,8 @@ def write_sysinfo(op):
     else:
         output.write("\nOpenGL\n")
         output.write(lilies)
-        output.write("renderer:\t%r\n" % (bgl.glGetString(bgl.GL_RENDERER)))
+        version = bgl.glGetString(bgl.GL_RENDERER);
+        output.write("renderer:\t%r\n" % version)
         output.write("vendor:\t\t%r\n" % (bgl.glGetString(bgl.GL_VENDOR)))
         output.write("version:\t%r\n" % (bgl.glGetString(bgl.GL_VERSION)))
         output.write("extensions:\n")
@@ -163,6 +164,29 @@ def write_sysinfo(op):
         for l in glext:
             output.write("\t\t%r\n" % (l))
 
+        output.write("\nImplementation Dependent OpenGL Limits:\n")
+        output.write(lilies)
+        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])
+
+        output.write("\nGLSL:\n")
+        if version[0] > '1':
+            bgl.glGetIntegerv(bgl.GL_MAX_VARYING_FLOATS, limit)
+            output.write("Maximum Varying Floats:\t%d\n" % limit[0])
+            bgl.glGetIntegerv(bgl.GL_MAX_VERTEX_ATTRIBS, limit)
+            output.write("Maximum Vertex Attributes:\t%d\n" % limit[0])
+            bgl.glGetIntegerv(bgl.GL_MAX_VERTEX_UNIFORM_COMPONENTS, limit)
+            output.write("Maximum Vertex Uniform Components:\t%d\n" % limit[0])
+            bgl.glGetIntegerv(bgl.GL_MAX_FRAGMENT_UNIFORM_COMPONENTS, limit)
+            output.write("Maximum Fragment Uniform Components:\t%d\n" % limit[0])
+            bgl.glGetIntegerv(bgl.GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS, limit)
+            output.write("Maximum Vertex Image Units:\t%d\n" % limit[0])
+            bgl.glGetIntegerv(bgl.GL_MAX_TEXTURE_IMAGE_UNITS, limit)
+            output.write("Maximum Fragment Image Units:\t%d\n" % limit[0])
+            bgl.glGetIntegerv(bgl.GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, limit)
+            output.write("Maximum Pipeline Image Units:\t%d\n" % limit[0])
+
     output.current_line_index = 0
 
     op.report({'INFO'}, "System information generated in 'system-info.txt'")
diff --git a/source/blender/python/generic/bgl.c b/source/blender/python/generic/bgl.c
index e77a528..b8dcf9d 100644
--- a/source/blender/python/generic/bgl.c
+++ b/source/blender/python/generic/bgl.c
@@ -1898,9 +1898,20 @@ PyObject *BPyInit_bgl(void)
 	EXPP_ADDCONST(GL_TEXTURE7);
 	EXPP_ADDCONST(GL_TEXTURE8);
 
+	EXPP_ADDCONST(GL_MAX_TEXTURE_UNITS);
+	
 	EXPP_ADDCONST(GL_DEPTH_COMPONENT32);
 	EXPP_ADDCONST(GL_TEXTURE_COMPARE_MODE);
 
+	EXPP_ADDCONST(GL_MAX_VARYING_FLOATS);
+	EXPP_ADDCONST(GL_MAX_VERTEX_ATTRIBS);	
+	EXPP_ADDCONST(GL_MAX_VARYING_FLOATS);
+	EXPP_ADDCONST(GL_MAX_VERTEX_UNIFORM_COMPONENTS);
+	EXPP_ADDCONST(GL_MAX_FRAGMENT_UNIFORM_COMPONENTS);
+	EXPP_ADDCONST(GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS);
+	EXPP_ADDCONST(GL_MAX_TEXTURE_IMAGE_UNITS);
+	EXPP_ADDCONST(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS);
+
 	return submodule;
 }




More information about the Bf-blender-cvs mailing list