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

Timestamp:

Sep 17, 2010 8:18:39 PM (14 years ago)

Author:

vboxsync

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

66026

Message:

wddm: VBOXWDDM->VBOX_WITH_WDDM

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA.cpp (modified) (1 diff)
• DevVGA.h (modified) (1 diff)
• DevVGASavedState.h (modified) (1 diff)
• DevVGA_VBVA.cpp (modified) (3 diffs)
• HGSMI/HGSMIHost.cpp (modified) (8 diffs)
• HGSMI/HGSMIHost.h (modified) (1 diff)

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

@@ -5661 +5661 @@
 
     if (    uVersion != VGA_SAVEDSTATE_VERSION
-#ifdef VBOXWDDM
+#ifdef VBOX_WITH_WDDM
         &&  uVersion != VGA_SAVEDSTATE_VERSION_PRE_WDDM
 #endif

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

@@ -408 +408 @@
     /** Base port in the assigned PCI I/O space. */
     RTIOPORT                    IOPortBase;
-#ifdef VBOXWDDM
+#ifdef VBOX_WITH_WDDM
     uint8_t                     Padding7[2];
     /* specifies guest driver caps, i.e. whether it can handle IRQs from the adapter,

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

@@ -23 +23 @@
 #define ___Graphics_DevVGASavedState_h
 
-#ifdef VBOXWDDM
+#ifdef VBOX_WITH_WDDM
 #define VGA_SAVEDSTATE_VERSION              7
 #define VGA_SAVEDSTATE_VERSION_PRE_WDDM     6

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

@@ -1248 +1248 @@
 
         Assert(pCmd->Flags & VBOXVHWACMD_FLAG_HG_ASYNCH);
-#ifdef VBOXWDDM
+#ifdef VBOX_WITH_WDDM
         if (pVGAState->fGuestCaps & VBVACAPS_COMPLETEGCMD_BY_IOREAD)
         {
@@ -1343 +1343 @@
 static DECLCALLBACK(void) vbvaNotifyGuest (void *pvCallback)
 {
-#if defined(VBOX_WITH_HGSMI) && (defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOXVDMA) || defined(VBOXWDDM))
+#if defined(VBOX_WITH_HGSMI) && (defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOXVDMA) || defined(VBOX_WITH_WDDM))
     PVGASTATE pVGAState = (PVGASTATE)pvCallback;
     PPDMDEVINS pDevIns = pVGAState->pDevInsR3;
@@ -1639 +1639 @@
 #endif
 
-#ifdef VBOXWDDM
+#ifdef VBOX_WITH_WDDM
         case VBVA_INFO_CAPS:
         {

trunk/src/VBox/Devices/Graphics/HGSMI/HGSMIHost.cpp

@@ -148 +148 @@
     HGSMILIST hostFIFOProcessed;       /* Processed by the guest. */
     HGSMILIST hostFIFOFree;            /* Buffers for reuse. */
-#ifdef VBOXWDDM
+#ifdef VBOX_WITH_WDDM
     HGSMILIST guestCmdCompleted;       /* list of completed guest commands to be returned to the guest*/
 #endif
@@ -210 +210 @@
 static DECLCALLBACK(void) hgsmiHostCommandFreeCallback (void *pvCallback);
 
-#ifdef VBOXWDDM
+#ifdef VBOX_WITH_WDDM
 
 typedef struct _HGSMIGUESTCOMPLENTRY
@@ -369 +369 @@
 }
 
-#ifdef VBOXWDDM
+#ifdef VBOX_WITH_WDDM
 static HGSMIOFFSET hgsmiProcessGuestCmdCompletion(HGSMIINSTANCE *pIns)
 {
@@ -414 +414 @@
     VM_ASSERT_EMT(pIns->pVM);
 
-#ifndef VBOXWDDM
+#ifndef VBOX_WITH_WDDM
     /* Currently there is no functionality here. */
     NOREF(pIns);
@@ -1259 +1259 @@
             rc = hgsmiHostSaveFifoLocked (&pIns->hostFIFORead, pSSM); AssertRC(rc);
             rc = hgsmiHostSaveFifoLocked (&pIns->hostFIFOProcessed, pSSM); AssertRC(rc);
-#ifdef VBOXWDDM
+#ifdef VBOX_WITH_WDDM
             rc = hgsmiHostSaveFifoLocked (&pIns->guestCmdCompleted, pSSM); AssertRC(rc);
 #endif
@@ -1325 +1325 @@
                 if (RT_SUCCESS(rc))
                     rc = hgsmiHostLoadFifoLocked (pIns, &pIns->hostFIFOProcessed, pSSM);
-#ifdef VBOXWDDM
+#ifdef VBOX_WITH_WDDM
                 if (RT_SUCCESS(rc) && u32Version > VGA_SAVEDSTATE_VERSION_PRE_WDDM)
                     rc = hgsmiHostLoadFifoLocked (pIns, &pIns->hostFIFOProcessed, pSSM);
@@ -1650 +1650 @@
     while(hgsmiProcessHostCmdCompletion (pIns, 0, true)) {}
 
-#ifdef VBOXWDDM
+#ifdef VBOX_WITH_WDDM
     while(hgsmiProcessGuestCmdCompletion(pIns) != HGSMIOFFSET_VOID) {}
 #endif
@@ -1688 +1688 @@
 }
 
-#ifdef VBOXWDDM
+#ifdef VBOX_WITH_WDDM
 
 static int hgsmiGuestCommandComplete (HGSMIINSTANCE *pIns, HGSMIOFFSET offMem)

trunk/src/VBox/Devices/Graphics/HGSMI/HGSMIHost.h

@@ -132 +132 @@
 int HGSMIHostSaveStateExec (PHGSMIINSTANCE pIns, PSSMHANDLE pSSM);
 
-#ifdef VBOXWDDM
+#ifdef VBOX_WITH_WDDM
 int HGSMICompleteGuestCommand(PHGSMIINSTANCE pIns, void *pvMem, bool bDoIrq);
 #endif