Changeset 37613 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Timestamp:

Jun 23, 2011 12:42:08 PM (14 years ago)

Author:

vboxsync

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

72459

Message:

wddm/3d: fix snapshots with aero

Location:

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Files:

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

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

@@ -318 +318 @@
         }
     }
-}
-
+
+    if (!mural->bUseFBO)
+    {
+        ctx->buffer.width = mural->width;
+        ctx->buffer.height = mural->height;
+    }
+    else
+    {
+        ctx->buffer.width = 0;
+        ctx->buffer.height = 0;
+    }
+}
+

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

@@ -1206 +1206 @@
             cr_server.curClient = cr_server.clients[i];
             if (cr_server.curClient->currentCtx
-                && cr_server.curClient->currentCtx->pImage
+                && (cr_server.curClient->currentCtx->buffer.pFrontImg || cr_server.curClient->currentCtx->buffer.pBackImg)
                 && cr_server.curClient->currentMural
                 && cr_server.curClient->currentMural->screenId == sIndex
-                && cr_server.curClient->currentCtx->viewport.viewportH == h
-                && cr_server.curClient->currentCtx->viewport.viewportW == w)
+                && cr_server.curClient->currentCtx->buffer.storedHeight == h
+                && cr_server.curClient->currentCtx->buffer.storedWidth == w)
             {
                 int clientWindow = cr_server.curClient->currentWindow;

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

@@ -230 +230 @@
             cr_server.head_spu->dispatch_table.BindFramebufferEXT(GL_READ_FRAMEBUFFER, mural->idFBO);
         }
+
+        crStateGetCurrent()->buffer.width = 0;
+        crStateGetCurrent()->buffer.height = 0;
     }
     else
@@ -246 +249 @@
             }
         }
+
+        crStateGetCurrent()->buffer.width = mural->width;
+        crStateGetCurrent()->buffer.height = mural->height;
     }
 

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

@@ -103 +103 @@
 
         crServerSetupOutputRedirect(mural);
+
+        crStateGetCurrent()->buffer.width = mural->width;
+        crStateGetCurrent()->buffer.height = mural->height;
     }
 
@@ -252 +255 @@
     mural->height = height;
 
+    crStateGetCurrent()->buffer.width = mural->width;
+    crStateGetCurrent()->buffer.height = mural->height;
+
     crServerCheckMuralGeometry(mural);