Changeset 32989 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm

Timestamp:

Oct 7, 2010 3:47:31 PM (14 years ago)

Author:

vboxsync

Message:

Additions/WINNT/Graphics: more refactoring

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm

Files:

• VBoxVideoVbva.cpp (modified) (5 diffs)
• VBoxVideoVdma.cpp (modified) (6 diffs)
• VBoxVideoVhwa.cpp (modified) (3 diffs)
• VBoxVideoWddm.cpp (modified) (12 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoVbva.cpp

@@ -22 +22 @@
 {
     int rc = VERR_NO_MEMORY;
-    void *p = vboxHGSMIBufferAlloc (pDevExt,
+    void *p = vboxHGSMIBufferAlloc (commonFromDeviceExt(pDevExt),
                                   sizeof (VBVAENABLE_EX),
                                   HGSMI_CH_VBVA,
@@ -43 +43 @@
         pEnable->i32Result = VERR_NOT_SUPPORTED;
 
-        vboxHGSMIBufferSubmit (pDevExt, p);
+        vboxHGSMIBufferSubmit (commonFromDeviceExt(pDevExt), p);
 
         if (bEnable)
@@ -53 +53 @@
             rc = VINF_SUCCESS;
 
-        vboxHGSMIBufferFree (pDevExt, p);
+        vboxHGSMIBufferFree (commonFromDeviceExt(pDevExt), p);
     }
     return rc;
@@ -151 +151 @@
 {
     /* Issue the flush command. */
-    void *p = vboxHGSMIBufferAlloc (pDevExt,
+    void *p = vboxHGSMIBufferAlloc (commonFromDeviceExt(pDevExt),
                               sizeof (VBVAFLUSH),
                               HGSMI_CH_VBVA,
@@ -166 +166 @@
         pFlush->u32Reserved = 0;
 
-        vboxHGSMIBufferSubmit (pDevExt, p);
-
-        vboxHGSMIBufferFree (pDevExt, p);
+        vboxHGSMIBufferSubmit (commonFromDeviceExt(pDevExt), p);
+
+        vboxHGSMIBufferFree (commonFromDeviceExt(pDevExt), p);
     }
 

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoVdma.cpp

@@ -1002 +1002 @@
 static int vboxWddmVdmaSubmitHgsmi(struct _DEVICE_EXTENSION* pDevExt, PVBOXVDMAINFO pInfo, HGSMIOFFSET offDr)
 {
-    VBoxHGSMIGuestWrite(hgsmiFromDeviceExt(pDevExt), offDr);
+    VBoxHGSMIGuestWrite(commonFromDeviceExt(pDevExt), offDr);
     return VINF_SUCCESS;
 }
@@ -1012 +1012 @@
     int rc = VINF_SUCCESS;
 
-    PVBOXVDMA_CTL pCmd = (PVBOXVDMA_CTL)VBoxSHGSMICommandAlloc(&hgsmiFromDeviceExt(pDevExt)->hgsmiAdapterHeap, sizeof (VBOXVDMA_CTL), HGSMI_CH_VBVA, VBVA_VDMA_CTL);
+    PVBOXVDMA_CTL pCmd = (PVBOXVDMA_CTL)VBoxSHGSMICommandAlloc(&commonFromDeviceExt(pDevExt)->hgsmiAdapterHeap, sizeof (VBOXVDMA_CTL), HGSMI_CH_VBVA, VBVA_VDMA_CTL);
     if (pCmd)
     {
@@ -1019 +1019 @@
         pCmd->i32Result = VERR_NOT_SUPPORTED;
 
-        const VBOXSHGSMIHEADER* pHdr = VBoxSHGSMICommandPrepSynch(&hgsmiFromDeviceExt(pDevExt)->hgsmiAdapterHeap, pCmd);
+        const VBOXSHGSMIHEADER* pHdr = VBoxSHGSMICommandPrepSynch(&commonFromDeviceExt(pDevExt)->hgsmiAdapterHeap, pCmd);
         Assert(pHdr);
         if (pHdr)
@@ -1025 +1025 @@
             do
             {
-                HGSMIOFFSET offCmd = VBoxSHGSMICommandOffset(&hgsmiFromDeviceExt(pDevExt)->hgsmiAdapterHeap, pHdr);
+                HGSMIOFFSET offCmd = VBoxSHGSMICommandOffset(&commonFromDeviceExt(pDevExt)->hgsmiAdapterHeap, pHdr);
                 Assert(offCmd != HGSMIOFFSET_VOID);
                 if (offCmd != HGSMIOFFSET_VOID)
@@ -1033 +1033 @@
                     if (RT_SUCCESS(rc))
                     {
-                        rc = VBoxSHGSMICommandDoneSynch(&hgsmiFromDeviceExt(pDevExt)->hgsmiAdapterHeap, pHdr);
+                        rc = VBoxSHGSMICommandDoneSynch(&commonFromDeviceExt(pDevExt)->hgsmiAdapterHeap, pHdr);
                         AssertRC(rc);
                         if (RT_SUCCESS(rc))
@@ -1046 +1046 @@
                     rc = VERR_INVALID_PARAMETER;
                 /* fail to submit, cancel it */
-                VBoxSHGSMICommandCancelSynch(&hgsmiFromDeviceExt(pDevExt)->hgsmiAdapterHeap, pHdr);
+                VBoxSHGSMICommandCancelSynch(&commonFromDeviceExt(pDevExt)->hgsmiAdapterHeap, pHdr);
             } while (0);
         }
 
-        VBoxSHGSMICommandFree (&hgsmiFromDeviceExt(pDevExt)->hgsmiAdapterHeap, pCmd);
+        VBoxSHGSMICommandFree (&commonFromDeviceExt(pDevExt)->hgsmiAdapterHeap, pCmd);
     }
     else

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoVhwa.cpp

@@ -45 +45 @@
     if(!cRefs)
     {
-        vboxHGSMIBufferFree(pDevExt, pCmd);
+        vboxHGSMIBufferFree(commonFromDeviceExt(pDevExt), pCmd);
     }
 }
@@ -61 +61 @@
     vbvaVhwaCommandRetain(pDevExt, pCmd);
 
-    vboxHGSMIBufferSubmit(pDevExt, pCmd);
+    vboxHGSMIBufferSubmit(commonFromDeviceExt(pDevExt), pCmd);
 
     if(!(pCmd->Flags & VBOXVHWACMD_FLAG_HG_ASYNCH)
@@ -100 +100 @@
                               VBVA_VHWA_CMD);
 #else
-    VBOXVHWACMD* pHdr = (VBOXVHWACMD*)vboxHGSMIBufferAlloc(pDevExt,
+    VBOXVHWACMD* pHdr = (VBOXVHWACMD*)vboxHGSMIBufferAlloc(commonFromDeviceExt(pDevExt),
                               cbCmd + VBOXVHWACMD_HEADSIZE(),
                               HGSMI_CH_VBVA,

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoWddm.cpp

@@ -107 +107 @@
 NTSTATUS vboxWddmGhDisplayPostInfoScreenBySDesc (PDEVICE_EXTENSION pDevExt, PVBOXWDDM_SURFACE_DESC pDesc, POINT * pVScreenPos, uint16_t fFlags)
 {
-    void *p = vboxHGSMIBufferAlloc (pDevExt,
+    void *p = vboxHGSMIBufferAlloc (commonFromDeviceExt(pDevExt),
                                       sizeof (VBVAINFOSCREEN),
                                       HGSMI_CH_VBVA,
@@ -126 +126 @@
         pScreen->u16Flags        = fFlags;
 
-        vboxHGSMIBufferSubmit (pDevExt, p);
-
-        vboxHGSMIBufferFree (pDevExt, p);
+        vboxHGSMIBufferSubmit (commonFromDeviceExt(pDevExt), p);
+
+        vboxHGSMIBufferFree (commonFromDeviceExt(pDevExt), p);
     }
 
@@ -150 +150 @@
 
     /* Issue the screen info command. */
-    void *p = vboxHGSMIBufferAlloc (pDevExt,
+    void *p = vboxHGSMIBufferAlloc (commonFromDeviceExt(pDevExt),
                                       sizeof (VBVAINFOVIEW),
                                       HGSMI_CH_VBVA,
@@ -165 +165 @@
         pView->u32MaxScreenSize = pView->u32ViewSize;
 
-        vboxHGSMIBufferSubmit (pDevExt, p);
-
-        vboxHGSMIBufferFree (pDevExt, p);
+        vboxHGSMIBufferSubmit (commonFromDeviceExt(pDevExt), p);
+
+        vboxHGSMIBufferFree (commonFromDeviceExt(pDevExt), p);
     }
 
@@ -268 +268 @@
         return &pDevExt->u.primary.Vdma.CmdHeap;
 #endif
-    if (HGSMIAreaContainsOffset(&hgsmiFromDeviceExt(pDevExt)->hgsmiAdapterHeap.area, offCmd))
-        return &hgsmiFromDeviceExt(pDevExt)->hgsmiAdapterHeap;
+    if (HGSMIAreaContainsOffset(&commonFromDeviceExt(pDevExt)->hgsmiAdapterHeap.area, offCmd))
+        return &commonFromDeviceExt(pDevExt)->hgsmiAdapterHeap;
     return NULL;
 }
@@ -288 +288 @@
         return VBOXWDDM_HGSMICMD_TYPE_DMACMD;
 #endif
-    if (HGSMIAreaContainsOffset(&hgsmiFromDeviceExt(pDevExt)->hgsmiAdapterHeap.area, offCmd))
+    if (HGSMIAreaContainsOffset(&commonFromDeviceExt(pDevExt)->hgsmiAdapterHeap.area, offCmd))
         return VBOXWDDM_HGSMICMD_TYPE_CTL;
     return VBOXWDDM_HGSMICMD_TYPE_UNDEFINED;
@@ -421 +421 @@
        if (VBoxHGSMIIsSupported (pContext))
        {
-           hgsmiFromDeviceExt(pContext)->IOPortHost = (RTIOPORT)VGA_PORT_HGSMI_HOST;
-           hgsmiFromDeviceExt(pContext)->IOPortGuest = (RTIOPORT)VGA_PORT_HGSMI_GUEST;
+           commonFromDeviceExt(pContext)->IOPortHost = (RTIOPORT)VGA_PORT_HGSMI_HOST;
+           commonFromDeviceExt(pContext)->IOPortGuest = (RTIOPORT)VGA_PORT_HGSMI_GUEST;
 
            PCM_RESOURCE_LIST pRcList = pDeviceInfo->TranslatedResourceList;
@@ -580 +580 @@
                  */
                 VBoxSetupDisplaysHGSMI(pContext, AdapterMemorySize);
-                if (hgsmiFromDeviceExt(pContext)->bHGSMI)
+                if (commonFromDeviceExt(pContext)->bHGSMI)
                 {
                     drprintf(("VBoxVideoWddm: using HGSMI\n"));
@@ -794 +794 @@
             {
                 /* read the command offset */
-                HGSMIOFFSET offCmd = VBoxHGSMIGuestRead(hgsmiFromDeviceExt(pDevExt));
+                HGSMIOFFSET offCmd = VBoxHGSMIGuestRead(commonFromDeviceExt(pDevExt));
                 Assert(offCmd != HGSMIOFFSET_VOID);
                 if (offCmd != HGSMIOFFSET_VOID)
@@ -811 +811 @@
                         case VBOXWDDM_HGSMICMD_TYPE_CTL:
                             pList = &CtlList;
-                            pHeap = &hgsmiFromDeviceExt(pDevExt)->hgsmiAdapterHeap;
+                            pHeap = &commonFromDeviceExt(pDevExt)->hgsmiAdapterHeap;
                             break;
                         default:
@@ -888 +888 @@
         if (bOur)
         {
-            HGSMIClearIrq (hgsmiFromDeviceExt(pDevExt));
+            HGSMIClearIrq (commonFromDeviceExt(pDevExt));
 #ifdef DEBUG_misha
             /* this is not entirely correct since host may concurrently complete some commands and raise a new IRQ while we are here,
@@ -974 +974 @@
     if (!vboxSHGSMIListIsEmpty(&context.data.CtlList))
     {
-        int rc = VBoxSHGSMICommandPostprocessCompletion (&hgsmiFromDeviceExt(pDevExt)->hgsmiAdapterHeap, &context.data.CtlList);
+        int rc = VBoxSHGSMICommandPostprocessCompletion (&commonFromDeviceExt(pDevExt)->hgsmiAdapterHeap, &context.data.CtlList);
         AssertRC(rc);
     }