Changeset 55358 in vbox for trunk

Timestamp:

Apr 21, 2015 3:53:01 PM (10 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxvideo: move dirty rectangle handler initialisation into the main source file.

Location:

trunk/src/VBox/Additions/x11/vboxvideo

Files:

• vboxvideo.c (modified) (2 diffs)
• vboxvideo.h (modified) (1 diff)
• vbva.c (modified) (2 diffs)

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

@@ -98 +98 @@
 /* #define DPMS_SERVER
 #include "extensions/dpms.h" */
+
+/* ShadowFB support */
+#include "shadowfb.h"
 
 /* VGA hardware functions for setting and restoring text mode */
@@ -1271 +1274 @@
     vbox_open (pScrn, pScreen, pVBox);
     vboxEnableVbva(pScrn);
+    /* Set up the dirty rectangle handler.  It will be added into a function
+     * chain and gets removed when the screen is cleaned up. */
+    if (ShadowFBInit2(pScreen, NULL, vbvxHandleDirtyRect) != TRUE)
+        return FALSE;
     VBoxInitialiseSizeHints(pScrn);
 

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

@@ -286 +286 @@
 extern void vbox_close (ScrnInfoPtr pScrn, VBOXPtr pVBox);
 
+/* vbva.c */
+extern void vbvxHandleDirtyRect(ScrnInfoPtr pScrn, int iRects, BoxPtr aRects);
 extern Bool vboxEnableVbva(ScrnInfoPtr pScrn);
 extern void vboxDisableVbva(ScrnInfoPtr pScrn);

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

@@ -51 +51 @@
  *                rectangles
  */
-static void
-vboxHandleDirtyRect(ScrnInfoPtr pScrn, int iRects, BoxPtr aRects)
+void vbvxHandleDirtyRect(ScrnInfoPtr pScrn, int iRects, BoxPtr aRects)
 {
     VBVACMDHDR cmdHdr;
@@ -135 +134 @@
         return FALSE;
     }
-
-    /* Set up the dirty rectangle handler.  It will be added into a function
-     * chain and gets removed when the screen is cleaned up. */
-    if (ShadowFBInit2(pScreen, NULL, vboxHandleDirtyRect) != TRUE)
-    {
-        xf86DrvMsg(scrnIndex, X_ERROR,
-                   "Unable to install dirty rectangle handler for VirtualBox graphics acceleration.\n");
-        return FALSE;
-    }
     return TRUE;
 }