Changeset 47075 in vbox

Timestamp:

Jul 10, 2013 1:03:41 PM (12 years ago)

Author:

vboxsync

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

87125

Message:

crOpenGL: fix shader info getters

File:

• trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_getshaders.c (modified) (10 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_getshaders.c

@@ -47 +47 @@
         crServerReturnValue(&zero, sizeof(zero));
     }
+    /* zero out just the header to ensure it initially contains zero size values */
+    memset(pLocal, 0, sizeof (*pLocal));
     cr_server.head_spu->dispatch_table.GetActiveAttrib(crStateGetProgramHWID(program), index, bufSize, &pLocal->length, &pLocal->size, &pLocal->type, (char*)&pLocal[1]);
     crServerReturnValue(pLocal, pLocal->length+1+sizeof(crGetActive_t));
@@ -63 +65 @@
         crServerReturnValue(&zero, sizeof(zero));
     }
+    /* zero out just the header to ensure it initially contains zero size values */
+    memset(pLocal, 0, sizeof (*pLocal));
     cr_server.head_spu->dispatch_table.GetActiveUniform(crStateGetProgramHWID(program), index, bufSize, &pLocal->length, &pLocal->size, &pLocal->type, (char*)&pLocal[1]);
     crServerReturnValue(pLocal, pLocal->length+1+sizeof(crGetActive_t));
@@ -78 +82 @@
         crServerReturnValue(&zero, sizeof(zero));
     }
+    /* initial (fallback )value */
+    *pLocal = 0;
     cr_server.head_spu->dispatch_table.GetAttachedShaders(crStateGetProgramHWID(program), maxCount, pLocal, (GLuint*)&pLocal[1]);
 
@@ -102 +108 @@
         crServerReturnValue(&zero, sizeof(zero));
     }
+    /* initial (fallback )value */
+    *pLocal = 0;
     cr_server.head_spu->dispatch_table.GetAttachedObjectsARB(crStateGetProgramHWID(containerObj), maxCount, pLocal, (GLhandleARB*)&pLocal[1]);
 
@@ -129 +137 @@
         crServerReturnValue(&zero, sizeof(zero));
     }
+    /* initial (fallback )value */
+    *pLocal = 0;
     /*@todo: recheck*/
     hwid = crStateGetProgramHWID(obj);
@@ -148 +158 @@
         crServerReturnValue(&zero, sizeof(zero));
     }
+    /* initial (fallback )value */
+    *pLocal = 0;
     cr_server.head_spu->dispatch_table.GetShaderInfoLog(crStateGetShaderHWID(shader), bufSize, pLocal, (char*)&pLocal[1]);
     crServerReturnValue(pLocal, pLocal[0]+sizeof(GLsizei));
@@ -163 +175 @@
         crServerReturnValue(&zero, sizeof(zero));
     }
+    /* initial (fallback )value */
+    *pLocal = 0;
     cr_server.head_spu->dispatch_table.GetProgramInfoLog(crStateGetProgramHWID(program), bufSize, pLocal, (char*)&pLocal[1]);
     CRASSERT(pLocal[0] <= bufSize);
@@ -179 +193 @@
         crServerReturnValue(&zero, sizeof(zero));
     }
+    /* initial (fallback )value */
+    *pLocal = 0;
     cr_server.head_spu->dispatch_table.GetShaderSource(crStateGetShaderHWID(shader), bufSize, pLocal, (char*)&pLocal[1]);
     CRASSERT(pLocal[0] <= bufSize);
@@ -200 +216 @@
     }
     
+    /* initial (fallback )value */
+    *pLocal = 0;
     crStateGLSLProgramCacheUniforms(program, maxcbData, pLocal, (char*)&pLocal[1]);
 
@@ -208 +226 @@
 static GLint __GetUniformSize(GLuint program, GLint location)
 {
-    GLint  size;
-    GLenum type;
+    GLint  size = 0;
+    GLenum type = 0;
 
     /*@todo: check if index and location is the same*/