Changeset 41928 in vbox for trunk/src/VBox/HostServices/SharedOpenGL

Timestamp:

Jun 27, 2012 4:06:23 PM (13 years ago)

Author:

vboxsync

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

78793

Message:

crOpenGL: fix shader deletion

File:

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

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

@@ -41 +41 @@
 void SERVER_DISPATCH_APIENTRY crServerDispatchDeleteShader(GLuint shader)
 {
+    GLuint shaderHW = crStateGetShaderHWID(shader);
     crStateDeleteShader(shader);
-    cr_server.head_spu->dispatch_table.DeleteShader(crStateGetShaderHWID(shader));
+    if (shaderHW)
+        cr_server.head_spu->dispatch_table.DeleteShader(shaderHW);
+    else
+        crWarning("crServerDispatchDeleteShader: hwid not found for shader(%d)", shader);
 }
 
@@ -71 +75 @@
 void SERVER_DISPATCH_APIENTRY crServerDispatchDeleteProgram(GLuint program)
 {
+    GLuint hwId = crStateGetProgramHWID(program);
     crStateDeleteProgram(program);
-    cr_server.head_spu->dispatch_table.DeleteProgram(crStateGetProgramHWID(program));
+    if (hwId)
+        cr_server.head_spu->dispatch_table.DeleteProgram(hwId);
+    else
+        crWarning("crServerDispatchDeleteProgram: hwid not found for program(%d)", program);
 }
 
@@ -94 +102 @@
     {
         hwid = crStateGetShaderHWID(obj);
+        CRASSERT(hwid);
         crStateDeleteShader(obj);
     }
@@ -101 +110 @@
     }
 
-    cr_server.head_spu->dispatch_table.DeleteObjectARB(hwid);
+    if (hwid)
+        cr_server.head_spu->dispatch_table.DeleteObjectARB(hwid);
 }