Changeset 44740 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_window.c

Timestamp:

Feb 18, 2013 5:02:47 PM (12 years ago)

Author:

vboxsync

Message:

crOpenGL: OSX backend rework; oddscreen rendering generalization

File:

• trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_window.c (modified) (8 diffs)

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

@@ -22 +22 @@
     GLint dims[2];
     GLint windowID = -1;
+    GLint spuWindow;
+    VBOXVR_TEXTURE Tex = {0};
+
+    int rc = CrVrScrCompositorInit(&mural->Compositor);
+    if (!RT_SUCCESS(rc))
+    {
+        crWarning("CrVrScrCompositorInit failed, rc %d", rc);
+        return -1;
+    }
+
     /*
      * Have first SPU make a new window.
      */
-    GLint spuWindow = cr_server.head_spu->dispatch_table.WindowCreate( dpyName, visBits );
+    spuWindow = cr_server.head_spu->dispatch_table.WindowCreate( dpyName, visBits );
     if (spuWindow < 0) {
-        crServerReturnValue( &spuWindow, sizeof(spuWindow) );
+        CrVrScrCompositorTerm(&mural->Compositor);
         return spuWindow;
     }
@@ -33 +43 @@
     /* get initial window size */
     cr_server.head_spu->dispatch_table.GetChromiumParametervCR(GL_WINDOW_SIZE_CR, spuWindow, GL_INT, 2, dims);
+
+    Tex.width = dims[0];
+    Tex.height = dims[1];
+    Tex.target = GL_TEXTURE_2D;
+    Tex.hwid = 0;
+    CrVrScrCompositorEntryInit(&mural->CEntry, &Tex);
 
     defaultMural = (CRMuralInfo *) crHashtableSearch(cr_server.muralTable, 0);
@@ -118 +134 @@
     {
         crWarning("crServerMuralInit failed!");
+        crServerReturnValue( &windowID, sizeof(windowID) );
         crFree(mural);
         return windowID;
@@ -290 +307 @@
     }
 
+    CrVrScrCompositorTerm(&mural->Compositor);
+
     crHashtableDelete(cr_server.muralTable, window, crFree);
 }
@@ -295 +314 @@
 void crServerMuralSize(CRMuralInfo *mural, GLint width, GLint height)
 {
-    mural->width = width;
-    mural->height = height;
+    if (mural->width != width || mural->height != height)
+    {
+        VBOXVR_TEXTURE Tex;
+        Tex.width = width;
+        Tex.height = height;
+        Tex.target = GL_TEXTURE_2D;
+        Tex.hwid = 0;
+        CrVrScrCompositorEntryRemove(&mural->Compositor, &mural->CEntry);
+        CrVrScrCompositorEntryInit(&mural->CEntry, &Tex);
+        mural->width = width;
+        mural->height = height;
+    }
 
     if (cr_server.curClient && cr_server.curClient->currentMural == mural)
@@ -342 +371 @@
 {
     CRMuralInfo *mural = (CRMuralInfo *) crHashtableSearch(cr_server.muralTable, window);
+    RTPOINT Pos;
     /*  crDebug("CRServer: Window %d pos %d, %d", window, x, y);*/
     if (!mural) {
@@ -352 +382 @@
     mural->gY = y;
 
+    Pos.x = x;
+    Pos.y = y;
+
+    CrVrScrCompositorEntryPosSet(&mural->Compositor, &mural->CEntry, &Pos);
+
     crServerCheckMuralGeometry(mural);
 }
@@ -392 +427 @@
                                                    cRects, (RTRECT *)pRects);
     }
+
+    CrVrScrCompositorEntryRegionsSet(&mural->Compositor, &mural->CEntry, NULL, cRects, (const RTRECT *)pRects);
 }