Changeset 58151 in vbox for trunk/src/VBox/GuestHost/OpenGL/state_tracker

Timestamp:

Oct 9, 2015 1:36:35 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

103258

Message:

GuestHost/OpenGL: get the number of active uniforms only if they exist.

File:

• trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_glsl.c (modified) (2 diffs)

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_glsl.c

@@ -1007 +1007 @@
 {
     CRGLSLProgram *pProgram = crStateGetProgramObj(program);
-    GLint maxUniformLen, activeUniforms=0, fakeUniformsCount, i, j;
+    GLint maxUniformLen = 0, activeUniforms=0, fakeUniformsCount, i, j;
     char *pCurrent = pData;
     GLsizei cbWritten;
@@ -1017 +1017 @@
     }
 
+    /*
+     * OpenGL spec says about GL_ACTIVE_UNIFORM_MAX_LENGTH:
+     * "If no active uniform variable exist, 0 is returned."
+     */ 
     diff_api.GetProgramiv(pProgram->hwid, GL_ACTIVE_UNIFORM_MAX_LENGTH, &maxUniformLen);
-    diff_api.GetProgramiv(pProgram->hwid, GL_ACTIVE_UNIFORMS, &activeUniforms);
+    if (maxUniformLen > 0)
+        diff_api.GetProgramiv(pProgram->hwid, GL_ACTIVE_UNIFORMS, &activeUniforms);
 
     *cbData = 0;