Changeset 50569 in vbox

Timestamp:

Feb 25, 2014 8:20:11 AM (11 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxvideo: remove graphics capability code which is now handled in VBoxClient.

Location:

trunk/src/VBox/Additions/x11/vboxvideo

Files:

• Makefile.kmk (modified) (2 diffs)
• setmode.c (modified) (1 diff)
• vboxvideo.c (modified) (3 diffs)

trunk/src/VBox/Additions/x11/vboxvideo/Makefile.kmk

@@ -30 +30 @@
 ifeq ($(KBUILD_TARGET),solaris) # don't use .solaris or anything here.
  vboxvideo_70_DEFS += __EXTENSIONS__  ## @todo Why this?
-endif
-ifdef VBOX_WITH_GUEST_KMS_DRIVER
- vboxvideo_70_DEFS += VBOX_WITH_GUEST_KMS_DRIVER
 endif
 vboxvideo_13_DEFS := $(vboxvideo_70_DEFS) VBOXVIDEO_13
@@ -80 +77 @@
         IN_MODULE XFree86Module IN_XF86_MODULE IN_RT_STATIC
 vboxvideo_drv_DEFS += memset=xf86memset memcpy=xf86memcpy
-ifdef VBOX_WITH_GUEST_KMS_DRIVER
- vboxvideo_drv_DEFS += VBOX_WITH_GUEST_KMS_DRIVER
-endif
 vboxvideo_drv_INCS = \
         $(VBOX_PATH_X11_XFREE_4_3)/include \

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

@@ -121 +121 @@
         VBoxVideoSetModeRegisters(cwReal, cHeight, pScrn->displayWidth,
                                   vboxBPP(pScrn), 0, x, y);
-    /* Tell the host we support graphics */
-#ifndef VBOX_WITH_GUEST_KMS_DRIVER
-    if (vbox_device_available(pVBox))
-        vboxEnableGraphicsCap(pVBox);
-#endif
     if (pVBox->fHaveHGSMI)
     {

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

@@ -1053 +1053 @@
     if (vbox_open (pScrn, pScreen, pVBox)) {
         vboxEnableVbva(pScrn);
-#ifndef VBOX_WITH_GUEST_KMS_DRIVER
-        vboxEnableGraphicsCap(pVBox);
-#endif
     }
 
@@ -1223 +1220 @@
         vboxDisableVbva(pScrn);
     vboxClearVRAM(pScrn, 0, 0);
-#ifndef VBOX_WITH_GUEST_KMS_DRIVER
-    vboxDisableGraphicsCap(pVBox);
-#endif
 #ifdef VBOX_DRI_OLD
     if (pVBox->useDRI)
@@ -1250 +1244 @@
         if (pVBox->fHaveHGSMI)
             vboxDisableVbva(pScrn);
-#ifndef VBOX_WITH_GUEST_KMS_DRIVER
-        if (pScrn->vtSema)
-            vboxDisableGraphicsCap(pVBox);
-#endif
         vboxClearVRAM(pScrn, 0, 0);
     }