Changeset 45027 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_glsl.c

Timestamp:

Mar 13, 2013 6:17:40 PM (12 years ago)

Author:

vboxsync

Message:

crOpenGL: shader/program state fixes; glDrawXxx-based blitting fixes, etc.

File:

• trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_glsl.c (modified) (2 diffs)

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

@@ -30 +30 @@
 {
     /*@todo?crStateShaderSource(shader...);*/
+#ifdef DEBUG_misha
+    GLenum err = cr_server.head_spu->dispatch_table.GetError();
+#endif
     cr_server.head_spu->dispatch_table.ShaderSource(crStateGetShaderHWID(shader), count, string, length);
+#ifdef DEBUG_misha
+    err = cr_server.head_spu->dispatch_table.GetError();
+    CRASSERT(err == GL_NO_ERROR);
+#endif
 }
 
 void SERVER_DISPATCH_APIENTRY crServerDispatchCompileShader(GLuint shader)
 {
+#ifdef DEBUG_misha
+    GLint iCompileStatus = GL_FALSE;
+#endif
     crStateCompileShader(shader);
     cr_server.head_spu->dispatch_table.CompileShader(crStateGetShaderHWID(shader));
+#ifdef DEBUG_misha
+    cr_server.head_spu->dispatch_table.GetShaderiv(crStateGetShaderHWID(shader), GL_COMPILE_STATUS, &iCompileStatus);
+    Assert(iCompileStatus == GL_TRUE);
+#endif
 }
 
@@ -97 +111 @@
 void SERVER_DISPATCH_APIENTRY crServerDispatchDeleteObjectARB(GLhandleARB obj)
 {
-    GLuint hwid = crStateGetProgramHWID(obj);
-
-    if (!hwid)
-    {
-        hwid = crStateGetShaderHWID(obj);
-        CRASSERT(hwid);
-        crStateDeleteShader(obj);
-    }
-    else
-    {
-        crStateDeleteProgram(obj);
-    }
+    GLuint hwid =  crStateDeleteObjectARB(obj);
 
     if (hwid)
         cr_server.head_spu->dispatch_table.DeleteObjectARB(hwid);
+    else
+        crWarning("zero hwid for object %d", obj);
 }