Changeset 82109 in vbox for trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-win.cpp

Timestamp:

Nov 22, 2019 8:24:21 PM (5 years ago)

Author:

vboxsync

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

134919

Message:

DevVGA: Splitting up the VGASTATE structure. bugref:9218

File:

• trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-win.cpp (modified) (9 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-win.cpp

@@ -161 +161 @@
 
 
-int vmsvga3dInit(PVGASTATE pThis)
-{
+int vmsvga3dInit(PPDMDEVINS pDevIns, PVGASTATE pThis, PVGASTATECC pThisCC)
+{
+    RT_NOREF(pDevIns, pThisCC);
+
     PVMSVGA3DSTATE pState;
-    int rc;
-
     pThis->svga.p3dState = pState = (PVMSVGA3DSTATE)RTMemAllocZ(sizeof(VMSVGA3DSTATE));
     AssertReturn(pThis->svga.p3dState, VERR_NO_MEMORY);
 
     /* Create event semaphore. */
-    rc = RTSemEventCreate(&pState->WndRequestSem);
+    int rc = RTSemEventCreate(&pState->WndRequestSem);
     if (RT_FAILURE(rc))
     {
@@ -188 +188 @@
 }
 
-int vmsvga3dPowerOn(PVGASTATE pThis)
+int vmsvga3dPowerOn(PPDMDEVINS pDevIns, PVGASTATE pThis, PVGASTATECC pThisCC)
 {
     PVMSVGA3DSTATE pState = pThis->svga.p3dState;
     AssertReturn(pThis->svga.p3dState, VERR_NO_MEMORY);
     HRESULT hr;
+    RT_NOREF(pDevIns, pThisCC);
 
     if (pState->pD3D9)
@@ -205 +206 @@
     PFNDIRECT3DCREATE9EX pfnDirect3dCreate9Ex = (PFNDIRECT3DCREATE9EX)RTLdrGetSystemSymbol("d3d9.dll", "Direct3DCreate9Ex");
     if (!pfnDirect3dCreate9Ex)
-        return PDMDevHlpVMSetError(pThis->CTX_SUFF(pDevIns), VERR_SYMBOL_NOT_FOUND, RT_SRC_POS,
+        return PDMDevHlpVMSetError(pDevIns, VERR_SYMBOL_NOT_FOUND, RT_SRC_POS,
                                    "vmsvga3d: Unable to locate Direct3DCreate9Ex. This feature requires Vista and later.");
     hr = pfnDirect3dCreate9Ex(D3D_SDK_VERSION, &pState->pD3D9);
@@ -2319 +2320 @@
  *
  * @returns Failure status code or @a rc.
- * @param   pThis               The VGA device instance data.
+ * @param   pThis               The shared VGA instance data.
+ * @param   pThisCC             The VGA/VMSVGA state for ring-3.
  * @param   pState              The VMSVGA3d state.
  * @param   pSurface            The host surface.
@@ -2333 +2335 @@
  * @param   iBox                The current box number (for Direct 3D).
  */
-int vmsvga3dBackSurfaceDMACopyBox(PVGASTATE pThis, PVMSVGA3DSTATE pState, PVMSVGA3DSURFACE pSurface,
+int vmsvga3dBackSurfaceDMACopyBox(PVGASTATE pThis, PVGASTATECC pThisCC, PVMSVGA3DSTATE pState, PVMSVGA3DSURFACE pSurface,
                                   PVMSVGA3DMIPMAPLEVEL pMipLevel, uint32_t uHostFace, uint32_t uHostMipmap,
                                   SVGAGuestPtr GuestPtr, uint32_t cbGuestPitch, SVGA3dTransferType transfer,
@@ -2414 +2416 @@
 
         rc = vmsvgaR3GmrTransfer(pThis,
+                                 pThisCC,
                                  transfer,
                                  pu8LockedBuf,
@@ -2481 +2484 @@
         /* Copy data between the guest and the host buffer. */
         rc = vmsvgaR3GmrTransfer(pThis,
+                                 pThisCC,
                                  transfer,
                                  (uint8_t *)pMipLevel->pSurfaceData,
@@ -2558 +2562 @@
  *
  * @returns VBox status code.
- * @param   pThis           VGA device instance data.
+ * @param   pThis           The shared VGA instance data.
  * @param   cid             Context id
  */
@@ -2656 +2660 @@
  *
  * @returns VBox status code.
- * @param   pThis           VGA device instance data.
+ * @param   pThis           The shared VGA instance data.
  * @param   cid             Context id
  */