Changeset 17451 in vbox for trunk

Timestamp:

Mar 6, 2009 10:28:41 AM (16 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxvideo: fixes to the DRI code, and activate it

Location:

trunk/src/VBox/Additions/x11/vboxvideo

Files:

• Makefile.kmk (modified) (2 diffs)
• vboxvideo.h (modified) (6 diffs)
• vboxvideo_dri.c (modified) (2 diffs)

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

@@ -204 +204 @@
 vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
 vboxvideo_drv_15_DEFS := $(vboxvideo_drv_70_DEFS) NO_ANSIC PCIACCESS \
-                         VBOX_NO_LOW_COLOUR # VBOX_DRI
+                         VBOX_NO_LOW_COLOUR VBOX_DRI
 vboxvideo_drv_15_INCS = \
         $(VBOX_PATH_X11_XORG_1_5) \
         $(VBOX_PATH_X11_XORG_1_5)/X11 \
-        $(VBOX_PATH_X11_XORG_1_5)/xorg \
         $(VBOX_PATH_X11_ROOT)/glproto-1.4.9 \
         $(VBOX_PATH_X11_ROOT)/libdrm-2.3.1 \
-        $(VBOX_PATH_X11_ROOT)/xf86driproto-2.0.4
+        $(VBOX_PATH_X11_ROOT)/xf86driproto-2.0.4 \
+        $(VBOX_PATH_X11_ROOT)/xorg-server-1.5.3
 vboxvideo_drv_15_SOURCES  = \
         vboxvideo_15.c \
@@ -228 +228 @@
         $(VBOX_PATH_X11_XORG_1_6) \
         $(VBOX_PATH_X11_XORG_1_6)/X11 \
-        $(VBOX_PATH_X11_XORG_1_6)/xorg \
         $(VBOX_PATH_X11_ROOT)/glproto-1.4.9 \
         $(VBOX_PATH_X11_ROOT)/libdrm-2.4.5 \
-        $(VBOX_PATH_X11_ROOT)/xf86driproto-2.0.4
+        $(VBOX_PATH_X11_ROOT)/xf86driproto-2.0.4 \
+        $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0 \
+        $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
 vboxvideo_drv_16_SOURCES  = \
         vboxvideo_15.c \

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

@@ -150 +150 @@
 #define VBOX_DRIVER_NAME          "vboxvideo"
 
+#ifdef VBOX_DRI
 /* DRI support */
 #define _XF86DRI_SERVER_
@@ -158 +159 @@
 #include "dri.h"
 #undef u_int64_t
+#include "sarea.h"
 #include "GL/glxint.h"
 #include "GL/glxtokens.h"
@@ -164 +166 @@
 extern void GlxSetVisualConfigs(int nconfigs, __GLXvisualConfig *configs,
                                 void **configprivs);
+#endif
+
 #define VBOX_VIDEO_MAJOR  1
 #define VBOX_VIDEO_MINOR  0
-#define VBOX_DRM_DRIVER_NAME  "tdfx"    /* For now, as this driver is basically a stub. */
-#define VBOX_DRI_DRIVER_NAME  "swrast"  /* For starters. */
-#define VBOX_MAX_DRAWABLES    256       /* At random. */
+#define VBOX_DRM_DRIVER_NAME  "vboxvideo"  /* For now, as this driver is basically a stub. */
+#define VBOX_DRI_DRIVER_NAME  "vboxvideo"  /* For starters. */
+#define VBOX_MAX_DRAWABLES    256          /* At random. */
 
 #define VBOXPTR(p) ((VBOXPtr)((p)->driverPrivate))
@@ -217 +221 @@
     VMMDevMemory *pVMMDevMemory;
     VBVAMEMORY *pVbvaMemory;
+#ifdef VBOX_DRI
     Bool useDRI;
     int cVisualConfigs;
@@ -222 +227 @@
     DRIInfoRec *pDRIInfo;
     int drmFD;
+#endif
 } VBOXRec, *VBOXPtr;
 
@@ -250 +256 @@
 
 #endif /* _VBOXVIDEO_H_ */
+

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

@@ -249 +249 @@
         pDRIInfo->ddxDrawableTableEntry = VBOX_MAX_DRAWABLES;
         pDRIInfo->maxDrawableTableEntry = VBOX_MAX_DRAWABLES;
+        pDRIInfo->frameBufferPhysicalAddress = pVBox->base;
+        pDRIInfo->frameBufferSize = pVBox->mapSize;
+        pDRIInfo->frameBufferStride = pScrn->displayWidth;
+        pDRIInfo->SAREASize = SAREA_MAX;  /* we have no private bits yet. */
         /* This can't be zero, as the server callocs this size and checks for
          * non-NULL... */
@@ -351 +355 @@
 }
 
-/* Apparantly the next two are just legacy. */
+/* Apparently the next two are just legacy. */
 static Bool
 VBOXDRIOpenFullScreen(ScreenPtr pScreen)