Changeset 35102 in vbox

Timestamp:

Dec 14, 2010 4:23:46 PM (14 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxvideo: correctness fix

Location:

trunk/src/VBox/Additions/x11/vboxvideo

Files:

• vboxutils.c (modified) (3 diffs)
• vboxvideo.h (modified) (1 diff)

trunk/src/VBox/Additions/x11/vboxvideo/vboxutils.c

@@ -242 +242 @@
         pViews[i].u32ViewIndex = i;
         pViews[i].u32ViewOffset = 0;
-        pViews[i].u32ViewSize = pVBox->cbFramebuffer;
+        pViews[i].u32ViewSize = pVBox->cbView;
         pViews[i].u32MaxScreenSize = pVBox->cbFramebuffer;
     }
@@ -282 +282 @@
         return FALSE;
     }
-    pVBox->cbFramebuffer = offVRAMBaseMapping;
+    pVBox->cbView = pVBox->cbFramebuffer = offVRAMBaseMapping;
     pVBox->cScreens = VBoxHGSMIGetMonitorCount(&pVBox->guestCtx);
     xf86DrvMsg(scrnIndex, X_INFO, "Requested monitor count: %u\n",
                pVBox->cScreens);
-    rc = VBoxHGSMISendViewInfo(&pVBox->guestCtx, pVBox->cScreens,
-                               vboxFillViewInfo, (void *)pVBox);
     for (i = 0; i < pVBox->cScreens; ++i)
     {
@@ -296 +294 @@
                                    VBVA_MIN_BUFFER_SIZE);
     }
+    rc = VBoxHGSMISendViewInfo(&pVBox->guestCtx, pVBox->cScreens,
+                               vboxFillViewInfo, (void *)pVBox);
 
     /* Set up the dirty rectangle handler.  Since this seems to be a

trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.h

@@ -185 +185 @@
     /** The amount of VRAM available for use as a framebuffer */
     unsigned long cbFramebuffer;
+    /** The size of the framebuffer and the VBVA buffers at the end of it. */
+    unsigned long cbView;
     /** The current line size in bytes */
     uint32_t cbLine;