Changeset 57502 in vbox

Timestamp:

Aug 23, 2015 5:29:15 PM (9 years ago)

Author:

vboxsync

Message:

DevVGA-SVGA*: Some viewport sanity adjustments and comments.

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA.cpp (modified) (1 diff)
• DevVGA-SVGA3d-ogl.cpp (modified) (2 diffs)
• DevVGA.h (modified) (1 diff)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA.cpp

@@ -544 +544 @@
     Log(("vmsvgaPortSetViewPort: screen %d (%d,%d)(%d,%d)\n", uScreenId, x, y, cx, cy));
 
-    pThis->svga.viewport.x  = x;
-    pThis->svga.viewport.y  = y;
-    pThis->svga.viewport.cx = RT_MIN(cx, (uint32_t)pThis->svga.uWidth);
-    pThis->svga.viewport.cy = RT_MIN(cy, (uint32_t)pThis->svga.uHeight);
-    return;
+    if (x < pThis->svga.uWidth)
+    {
+        pThis->svga.viewport.x  = x;
+        pThis->svga.viewport.cx = RT_MIN(cx, pThis->svga.uWidth - x);
+    }
+    else
+    {
+        pThis->svga.viewport.x  = pThis->svga.uWidth;
+        pThis->svga.viewport.cx = 0;
+    }
+    if (y < pThis->svga.uHeight)
+    {
+        pThis->svga.viewport.y  = y;
+        pThis->svga.viewport.cy = RT_MIN(cy, pThis->svga.uHeight - y);
+    }
+    else
+    {
+        pThis->svga.viewport.y  = pThis->svga.uHeight;
+        pThis->svga.viewport.cy = 0;
+    }
 }
 

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp

@@ -2657 +2657 @@
         || pSurface->pMipmapLevels[0].size.height != pThis->svga.uHeight)
     {
-        float xMultiplier = (float)pSurface->pMipmapLevels[0].size.width / (float)pThis->svga.uWidth;
+        float xMultiplier = (float)pSurface->pMipmapLevels[0].size.width  / (float)pThis->svga.uWidth;
         float yMultiplier = (float)pSurface->pMipmapLevels[0].size.height / (float)pThis->svga.uHeight;
 
@@ -2941 +2941 @@
 
 #endif
-#ifndef RT_OS_DARWIN /* darwin: later */
+#ifndef RT_OS_DARWIN /* darwin: postponed till after buffer swap. */
     /* Reset the frame buffer association - see below.  */
     VMSVGA3D_ASSERT_GL_CALL(pState->ext.glBindFramebuffer(GL_FRAMEBUFFER, pContext->idFramebuffer), pState, pContext);

trunk/src/VBox/Devices/Graphics/DevVGA.h

@@ -309 +309 @@
     /** Maximum height supported. */
     uint32_t                    u32MaxHeight;
-    /** Viewport rectangle */
+    /** Viewport rectangle, i.e. what's currently visible of the target host
+     *  window.  This is usually (0,0)(uWidth,uHeight), but if the window is
+     *  shrunk and scrolling applied, both the origin and size may differ.  */
     struct
     {