Changeset 44951 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_main.c

Timestamp:

Mar 7, 2013 12:33:54 PM (12 years ago)

Author:

vboxsync

Message:

crOpenGL: fix default mural refs

File:

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

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

@@ -330 +330 @@
     defaultMural = (CRMuralInfo *) crCalloc(sizeof(CRMuralInfo));
     defaultMural->spuWindow = CR_RENDER_DEFAULT_WINDOW_ID;
-    crHashtableAdd(cr_server.muralTable, CR_RENDER_DEFAULT_WINDOW_ID, defaultMural);
+    crHashtableAdd(cr_server.muralTable, 0, defaultMural);
 
     cr_server.programTable = crAllocHashtable();
@@ -413 +413 @@
     defaultMural = (CRMuralInfo *) crCalloc(sizeof(CRMuralInfo));
     defaultMural->spuWindow = CR_RENDER_DEFAULT_WINDOW_ID;
-    crHashtableAdd(cr_server.muralTable, CR_RENDER_DEFAULT_WINDOW_ID, defaultMural);
+    crHashtableAdd(cr_server.muralTable, 0, defaultMural);
 
     cr_server.programTable = crAllocHashtable();
@@ -829 +829 @@
 
     if (!pMural->CreateInfo.externalID)
+    {
+        CRASSERT(!key);
         return;
+    }
 
     if (crHashtableSearch(pData->usedMuralTable, pMural->CreateInfo.externalID))
@@ -873 +876 @@
 
     if (!pMural->CreateInfo.externalID)
+    {
+        CRASSERT(!key);
         return;
+    }
 
     if (!CR_STATE_SHAREDOBJ_USAGE_IS_SET(pMural, pData->pContextInfo->pContext))