Changeset 33572 in vbox for trunk/src/VBox

Timestamp:

Oct 28, 2010 4:39:36 PM (14 years ago)

Author:

vboxsync

Message:

wddm/3d: enable hgsmi for chromium

Location:

trunk/src/VBox

Files:

• Devices/Graphics/DevVGA.cpp (modified) (1 diff)
• Devices/Graphics/DevVGA_VDMA.cpp (modified) (13 diffs)
• GuestHost/OpenGL/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Devices/Graphics/DevVGA.cpp

@@ -5394 +5394 @@
     LogFlow(("vgaR3Destruct:\n"));
 
+#ifdef VBOX_WITH_VDMA
+    vboxVDMADestruct(pThis->pVdma);
+#endif
+
     /*
      * Free MM heap pointers.

trunk/src/VBox/Devices/Graphics/DevVGA_VDMA.cpp

@@ -26 +26 @@
 #include "HGSMI/HGSMIHostHlp.h"
 
+#ifdef VBOX_VDMA_WITH_WORKERTHREAD
 typedef enum
 {
@@ -76 +77 @@
     VBOXVDMAPIPE_CMD aCmds[1];
 } VBOXVDMAPIPE_CMD_POOL, *PVBOXVDMAPIPE_CMD_POOL;
+#endif
 
 typedef struct VBOXVDMAHOST
 {
+    PHGSMIINSTANCE pHgsmi;
+    PVGASTATE pVGAState;
+    bool bEnabled;
+#ifdef VBOX_VDMA_WITH_WORKERTHREAD
     VBOXVDMAPIPE Pipe;
     HGSMILIST PendingList;
     RTTHREAD hWorkerThread;
-    PHGSMIINSTANCE pHgsmi;
-    PVGASTATE pVGAState;
-    bool bEnabled;
     VBOXVDMAPIPE_CMD_POOL CmdPool;
+#endif
 } VBOXVDMAHOST, *PVBOXVDMAHOST;
 
@@ -682 +686 @@
 }
 
+#ifdef VBOX_VDMA_WITH_WORKERTHREAD
+
 int vboxVDMAPipeConstruct(PVBOXVDMAPIPE pPipe)
 {
@@ -909 +915 @@
     return VINF_SUCCESS;
 }
+#endif
 
 static void vboxVDMACommandProcess(PVBOXVDMAHOST pVdma, PVBOXVDMACBUF_DR pCmd)
@@ -977 +984 @@
 }
 
+#ifdef VBOX_VDMA_WITH_WORKERTHREAD
 typedef struct
 {
@@ -1055 +1063 @@
     return rc;
 }
+#endif
 
 int vboxVDMAConstruct(PVGASTATE pVGAState, struct VBOXVDMAHOST **ppVdma, uint32_t cPipeElements)
 {
     int rc;
+#ifdef VBOX_VDMA_WITH_WORKERTHREAD
     PVBOXVDMAHOST pVdma = (PVBOXVDMAHOST)RTMemAllocZ (RT_OFFSETOF(VBOXVDMAHOST, CmdPool.aCmds[cPipeElements]));
+#else
+    PVBOXVDMAHOST pVdma = (PVBOXVDMAHOST)RTMemAllocZ (sizeof (*pVdma));
+#endif
     Assert(pVdma);
     if (pVdma)
     {
-        hgsmiListInit(&pVdma->PendingList);
         pVdma->pHgsmi = pVGAState->pHGSMI;
         pVdma->pVGAState = pVGAState;
+#ifdef VBOX_VDMA_WITH_WORKERTHREAD
+        hgsmiListInit(&pVdma->PendingList);
         rc = vboxVDMAPipeConstruct(&pVdma->Pipe);
         AssertRC(rc);
@@ -1080 +1094 @@
                     hgsmiListAppend(&pVdma->CmdPool.List, &pVdma->CmdPool.aCmds[i].Entry);
                 }
-#if 0 //def VBOX_WITH_CRHGSMI
+# if 0 //def VBOX_WITH_CRHGSMI
                 int tmpRc = vboxVDMACrCtlHgsmiSetup(pVdma);
-# ifdef DEBUG_misha
+#  ifdef DEBUG_misha
                 AssertRC(tmpRc);
+#  endif
 # endif
 #endif
                 *ppVdma = pVdma;
                 return VINF_SUCCESS;
+#ifdef VBOX_VDMA_WITH_WORKERTHREAD
             }
 
@@ -1095 +1111 @@
 
         RTMemFree(pVdma);
+#endif
     }
     else
@@ -1102 +1119 @@
 }
 
-int vboxVDMADestruct(struct VBOXVDMAHOST **pVdma)
-{
+int vboxVDMADestruct(struct VBOXVDMAHOST *pVdma)
+{
+#ifdef VBOX_VDMA_WITH_WORKERTHREAD
+    /* @todo: implement*/
     AssertBreakpoint();
+#endif
+    RTMemFree(pVdma);
     return VINF_SUCCESS;
 }
 
+#ifdef VBOX_VDMA_WITH_WORKERTHREAD
 typedef struct
 {
@@ -1135 +1157 @@
     return false;
 }
+#endif
 
 void vboxVDMAControl(struct VBOXVDMAHOST *pVdma, PVBOXVDMA_CTL pCmd)
@@ -1205 +1228 @@
 #endif
 
+    int rc = VERR_NOT_IMPLEMENTED;
+
+#ifdef VBOX_VDMA_WITH_WORKERTHREAD
+
 #ifdef DEBUG_misha
     Assert(0);
@@ -1214 +1241 @@
     Context.Cmd.u.pDr = pCmd;
 
-    int rc = vboxVDMAPipeModifyClient(&pVdma->Pipe, vboxVDMACommandSubmitCb, &Context);
+    rc = vboxVDMAPipeModifyClient(&pVdma->Pipe, vboxVDMACommandSubmitCb, &Context);
     AssertRC(rc);
     if (RT_SUCCESS(rc))
@@ -1226 +1253 @@
         rc = VERR_OUT_OF_RESOURCES;
     }
-
+#endif
     /* failure */
     Assert(RT_FAILURE(rc));

trunk/src/VBox/GuestHost/OpenGL/Makefile.kmk

@@ -89 +89 @@
         $(VBOX_LIB_IPRT_GUEST_R3_SHARED)
 ifdef VBOX_WITH_CRHGSMI
-VBoxOGLcrutil_DEFS    += VBOX_WITH_CRHGSMI 
-VBoxOGLcrutil_LIBS    += $(VBOX_PATH_ADDITIONS_LIB)/VBoxCrHgsmi$(VBOX_SUFF_LIB)
+VBoxOGLcrutil_DEFS.win.x86    += VBOX_WITH_CRHGSMI 
+VBoxOGLcrutil_LIBS.win.x86    += $(VBOX_PATH_ADDITIONS_LIB)/VBoxCrHgsmi$(VBOX_SUFF_LIB)
 endif
 VBoxOGLcrutil_CLEAN = \