Changeset 44924 in vbox

Timestamp:

Mar 5, 2013 11:21:27 AM (12 years ago)

Author:

vboxsync

Message:

crOpenGL: fix dealing with default mural

Location:

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Files:

• server_config.c (modified) (2 diffs)
• server_main.c (modified) (2 diffs)
• 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, 0);
+    defaultMural = (CRMuralInfo *) crHashtableSearch(cr_server.muralTable, CR_RENDER_DEFAULT_WINDOW_ID);
     CRASSERT(defaultMural);
 
@@ -283 +283 @@
     const char * env;
 
-    defaultMural = (CRMuralInfo *) crHashtableSearch(cr_server.muralTable, 0);
+    defaultMural = (CRMuralInfo *) crHashtableSearch(cr_server.muralTable, CR_RENDER_DEFAULT_WINDOW_ID);
     CRASSERT(defaultMural);
 

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

@@ -329 +329 @@
     cr_server.muralTable = crAllocHashtable();
     defaultMural = (CRMuralInfo *) crCalloc(sizeof(CRMuralInfo));
-    crHashtableAdd(cr_server.muralTable, 0, defaultMural);
+    defaultMural->spuWindow = CR_RENDER_DEFAULT_WINDOW_ID;
+    defaultMural->CreateInfo.externalID = -1;
+    crHashtableAdd(cr_server.muralTable, CR_RENDER_DEFAULT_WINDOW_ID, defaultMural);
 
     cr_server.programTable = crAllocHashtable();
@@ -411 +413 @@
     cr_server.muralTable = crAllocHashtable();
     defaultMural = (CRMuralInfo *) crCalloc(sizeof(CRMuralInfo));
-    crHashtableAdd(cr_server.muralTable, 0, defaultMural);
+    defaultMural->spuWindow = CR_RENDER_DEFAULT_WINDOW_ID;
+    defaultMural->CreateInfo.externalID = -1;
+    crHashtableAdd(cr_server.muralTable, CR_RENDER_DEFAULT_WINDOW_ID, defaultMural);
 
     cr_server.programTable = crAllocHashtable();

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

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