Changeset 32877 in vbox for trunk/src/VBox/Devices/Graphics

Timestamp:

Oct 1, 2010 10:51:28 PM (14 years ago)

Author:

vboxsync

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

66355

Message:

wddm/3d: basics for chromium over hgsmi

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA.cpp (modified) (2 diffs)
• DevVGA.h (modified) (4 diffs)
• DevVGA_VBVA.cpp (modified) (2 diffs)
• DevVGA_VDMA.cpp (modified) (1 diff)

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

@@ -2136 +2136 @@
 
     int rc;
-#ifdef VBOXVDMA
-    /* do not do pfnResize in case VBVA is on since all mode changes are poerofmed over VBVA
+#if 0 //def VBOX_WITH_VDMA
+    /* @todo: we get a second resize here when VBVA is on, while we actually should not */
+    /* do not do pfnResize in case VBVA is on since all mode changes are performed over VBVA
      * we are checking for VDMA state here to ensure this code works only for WDDM driver,
      * although we should avoid calling pfnResize for XPDM as well, since pfnResize is actually an extra resize
@@ -6851 +6852 @@
 #endif /* VBOX_WITH_HGSMI */
 
-#ifdef VBOXVDMA
+#ifdef VBOX_WITH_VDMA
     if(rc == VINF_SUCCESS)
     {

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

@@ -256 +256 @@
 #endif /* VBOX */
 
-#ifdef VBOXVDMA
+#ifdef VBOX_WITH_VDMA
 typedef struct VBOXVDMAHOST *PVBOXVDMAHOST;
 #endif
@@ -290 +290 @@
     R3PTRTYPE(PHGSMIINSTANCE)   pHGSMI;
 #endif /* VBOX_WITH_HGSMI */
-#ifdef VBOXVDMA
+#ifdef VBOX_WITH_VDMA
     R3PTRTYPE(PVBOXVDMAHOST)    pVdma;
 #endif
@@ -495 +495 @@
 int vboxVBVALoadStateDone (PPDMDEVINS pDevIns, PSSMHANDLE pSSM);
 
-# ifdef VBOXVDMA
+# ifdef VBOX_WITH_VDMA
 typedef struct VBOXVDMAHOST *PVBOXVDMAHOST;
 int vboxVDMAConstruct(PVGASTATE pVGAState, struct VBOXVDMAHOST **ppVdma, uint32_t cPipeElements);
@@ -502 +502 @@
 void vboxVDMACommand(PVBOXVDMAHOST pVdma, PVBOXVDMACBUF_DR pCmd);
 bool vboxVDMAIsEnabled(PVBOXVDMAHOST pVdma);
-# endif /* VBOXVDMA */
+# endif /* VBOX_WITH_VDMA */
 
 #endif /* VBOX_WITH_HGSMI */

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

@@ -1343 +1343 @@
 static DECLCALLBACK(void) vbvaNotifyGuest (void *pvCallback)
 {
-#if defined(VBOX_WITH_HGSMI) && (defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOXVDMA) || defined(VBOX_WITH_WDDM))
+#if defined(VBOX_WITH_HGSMI) && (defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_WITH_VDMA) || defined(VBOX_WITH_WDDM))
     PVGASTATE pVGAState = (PVGASTATE)pvCallback;
     PPDMDEVINS pDevIns = pVGAState->pDevInsR3;
@@ -1370 +1370 @@
     switch (u16ChannelInfo)
     {
-#ifdef VBOXVDMA
+#ifdef VBOX_WITH_VDMA
         case VBVA_VDMA_CMD:
         {

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

@@ -290 +290 @@
         switch (pCmd->enmType)
         {
+            case VBOXVDMACMD_TYPE_CHROMIUM_CMD:
+            {
+                /* todo: post the buffer to chromium */
+                return VINF_SUCCESS;
+            }
             case VBOXVDMACMD_TYPE_DMA_PRESENT_BLT:
             {