Changeset 49187 in vbox for trunk/src/VBox/Additions/x11

Timestamp:

Oct 18, 2013 3:11:33 PM (11 years ago)

Author:

vboxsync

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

90064

Message:

Additions/x11/vboxvideo: use DRI2 for X.Org Server 1.7 and later.

Location:

trunk/src/VBox/Additions/x11/vboxvideo

Files:

• Makefile.kmk (modified) (12 diffs)
• setmode.c (modified) (1 diff)
• undefined (modified) (1 diff)
• vboxvideo.c (modified) (4 diffs)
• vboxvideo.h (modified) (2 diffs)
• vboxvideo_dri2.c (added)

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

@@ -33 +33 @@
 vboxvideo_13_DEFS := $(vboxvideo_70_DEFS) VBOXVIDEO_13
 vboxvideo_15_DEFS := \
-        $(vboxvideo_13_DEFS) VBOX_DRI NO_ANSIC PCIACCESS XSERVER_LIBPCIACCESS
+        $(vboxvideo_13_DEFS) NO_ANSIC PCIACCESS XSERVER_LIBPCIACCESS
+if1of ($(KBUILD_TARGET), linux solaris)
+ vboxvideo_15_DEFS += \
+        VBOX_DRI
+endif
 vboxvideo_xorg_INCS = \
         $(VBOX_PATH_X11_ROOT)/fontsproto-2.1.0 \
@@ -195 +199 @@
 vboxvideo_drv_15_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100503000
 if1of ($(KBUILD_TARGET), linux solaris)
- vboxvideo_drv_15_DEFS += VBOX_DRI
+ vboxvideo_drv_15_DEFS += \
+        VBOX_DRI_OLD
 endif
 vboxvideo_drv_15_INCS = \
@@ -204 +209 @@
 if1of ($(KBUILD_TARGET), linux solaris)
  vboxvideo_drv_15_SOURCES += \
-        vboxvideo_dri.c
+        vboxvideo_dri.c
 endif
 
@@ -215 +220 @@
 vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
 vboxvideo_drv_16_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100600000
+if1of ($(KBUILD_TARGET), linux solaris)
+ vboxvideo_drv_16_DEFS += \
+        VBOX_DRI_OLD
+endif
 vboxvideo_drv_16_INCS = \
         $(vboxvideo_xorg_INCS) \
@@ -233 +242 @@
         $(VBOX_PATH_X11_ROOT)/xorg-server-1.7.7
 vboxvideo_drv_17_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
-vboxvideo_drv_17_SOURCES := $(vboxvideo_drv_15_SOURCES)
+vboxvideo_drv_17_SOURCES := $(vboxvideo_drv_13_SOURCES)
+if1of ($(KBUILD_TARGET), linux solaris)
+ vboxvideo_drv_17_SOURCES += \
+        vboxvideo_dri2.c
+endif
 
 
@@ -247 +260 @@
         $(VBOX_PATH_X11_ROOT)/xorg-server-1.8.0
 vboxvideo_drv_18_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
-vboxvideo_drv_18_SOURCES := $(vboxvideo_drv_15_SOURCES)
+vboxvideo_drv_18_SOURCES := $(vboxvideo_drv_17_SOURCES)
 
 
@@ -261 +274 @@
         $(VBOX_PATH_X11_ROOT)/xorg-server-1.9.0
 vboxvideo_drv_19_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
-vboxvideo_drv_19_SOURCES := $(vboxvideo_drv_15_SOURCES)
+vboxvideo_drv_19_SOURCES := $(vboxvideo_drv_17_SOURCES)
 
 
@@ -275 +288 @@
         $(VBOX_PATH_X11_ROOT)/xorg-server-1.10.0
 vboxvideo_drv_110_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
-vboxvideo_drv_110_SOURCES := $(vboxvideo_drv_15_SOURCES)
+vboxvideo_drv_110_SOURCES := $(vboxvideo_drv_17_SOURCES)
 
 
@@ -289 +302 @@
         $(VBOX_PATH_X11_ROOT)/xorg-server-1.11.0
 vboxvideo_drv_111_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
-vboxvideo_drv_111_SOURCES := $(vboxvideo_drv_15_SOURCES)
+vboxvideo_drv_111_SOURCES := $(vboxvideo_drv_17_SOURCES)
 
 
@@ -303 +316 @@
         $(VBOX_PATH_X11_ROOT)/xorg-server-1.12.0
 vboxvideo_drv_112_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
-vboxvideo_drv_112_SOURCES := $(vboxvideo_drv_15_SOURCES)
+vboxvideo_drv_112_SOURCES := $(vboxvideo_drv_17_SOURCES)
 
 
@@ -317 +330 @@
         $(VBOX_PATH_X11_ROOT)/xorg-server-1.13.0
 vboxvideo_drv_113_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
-vboxvideo_drv_113_SOURCES := $(vboxvideo_drv_15_SOURCES)
+vboxvideo_drv_113_SOURCES := $(vboxvideo_drv_17_SOURCES)
 
 
@@ -331 +344 @@
         $(VBOX_PATH_X11_ROOT)/xorg-server-1.14.0
 vboxvideo_drv_114_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
-vboxvideo_drv_114_SOURCES := $(vboxvideo_drv_15_SOURCES)
+vboxvideo_drv_114_SOURCES := $(vboxvideo_drv_17_SOURCES)
 
 

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

@@ -171 +171 @@
     pScrn->displayWidth = displayWidth;
     pVBox->cbLine = cbLine;
-#ifdef VBOX_DRI
+#ifdef VBOX_DRI_OLD
     if (pVBox->useDRI)
         VBOXDRIUpdateStride(pScrn, pVBox);

trunk/src/VBox/Additions/x11/vboxvideo/undefined

@@ +1 @@
+DRI2CloseScreen
+DRI2ScreenInit
 DRICloseScreen
 DRICreateInfoRec

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

@@ -828 +828 @@
         return FALSE;
 
-#ifdef VBOX_DRI
+#ifdef VBOX_DRI_OLD
     /* Load the dri module. */
     if (!xf86LoadSubModule(pScrn, "dri"))
         return FALSE;
+#else
+# ifdef VBOX_DRI
+    /* Load the dri module. */
+    if (!xf86LoadSubModule(pScrn, "dri2"))
+        return FALSE;
+# endif
 #endif
 
@@ -1160 +1166 @@
                    "Unable to start the VirtualBox mouse pointer integration with the host system.\n");
 
-#ifdef VBOX_DRI
+#ifdef VBOX_DRI_OLD
     if (pVBox->useDRI)
         pVBox->useDRI = VBOXDRIFinishScreenInit(pScreen);
@@ -1175 +1181 @@
     if (pVBox->fHaveHGSMI)
         vboxEnableVbva(pScrn);
-#ifdef VBOX_DRI
+#ifdef VBOX_DRI_OLD
     if (pVBox->useDRI)
         DRIUnlock(xf86ScrnToScreen(pScrn));
@@ -1204 +1210 @@
     VBOXRestoreMode(pScrn);
     vboxDisableGraphicsCap(pVBox);
-#ifdef VBOX_DRI
+#ifdef VBOX_DRI_OLD
     if (pVBox->useDRI)
         DRILock(xf86ScrnToScreen(pScrn), 0);

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

@@ -106 +106 @@
 #define VBOX_DRIVER_NAME        "vboxvideo"
 
-#ifdef VBOX_DRI
+#ifdef VBOX_DRI_OLD
 /* DRI support */
 #define _XF86DRI_SERVER_
@@ -192 +192 @@
 #ifdef VBOX_DRI
     Bool useDRI;
+#ifdef VBOX_DRI_OLD
     int cVisualConfigs;
     __GLXvisualConfig *pVisualConfigs;
     DRIInfoRec *pDRIInfo;
     int drmFD;
+# endif
 #endif
 } VBOXRec, *VBOXPtr;