Changeset 44951 in vbox for trunk/src/VBox/HostServices

Timestamp:

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

Author:

vboxsync

Message:

crOpenGL: fix default mural refs

Location:

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Files:

• server_config.c (modified) (2 diffs)
• server_main.c (modified) (4 diffs)
• server_muralfbo.c (modified) (1 diff)
• server_window.c (modified) (1 diff)

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

@@ -79 +79 @@
     const char * env;
 
-    defaultMural = (CRMuralInfo *) crHashtableSearch(cr_server.muralTable, CR_RENDER_DEFAULT_WINDOW_ID);
+    defaultMural = (CRMuralInfo *) crHashtableSearch(cr_server.muralTable, 0);
     CRASSERT(defaultMural);
 
@@ -283 +283 @@
     const char * env;
 
-    defaultMural = (CRMuralInfo *) crHashtableSearch(cr_server.muralTable, CR_RENDER_DEFAULT_WINDOW_ID);
+    defaultMural = (CRMuralInfo *) crHashtableSearch(cr_server.muralTable, 0);
     CRASSERT(defaultMural);
 

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))

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

@@ -102 +102 @@
     int overlappingScreenCount, primaryS, i;
 
+    if (!mural->CreateInfo.externalID)
+        return;
+
     if (!mural->width || !mural->height)
         return;

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

@@ -50 +50 @@
     CrVrScrCompositorEntryInit(&mural->CEntry, &Tex);
 
-    defaultMural = (CRMuralInfo *) crHashtableSearch(cr_server.muralTable, CR_RENDER_DEFAULT_WINDOW_ID);
+    defaultMural = (CRMuralInfo *) crHashtableSearch(cr_server.muralTable, 0);
     CRASSERT(defaultMural);
     mural->gX = 0;