Changeset 89171 in vbox for trunk/src/VBox/Devices

Timestamp:

May 19, 2021 2:10:51 PM (4 years ago)

Author:

vboxsync

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

144512

Message:

Devices/Graphics: Removed VBOX_VMSVGA3D_WITH_WINE_OPENGL, because it is not used.

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA3d-internal.h (modified) (3 diffs)
• DevVGA-SVGA3d-win.cpp (modified) (14 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-internal.h

@@ -392 +392 @@
 
 #endif /* VMSVGA3D_OPENGL */
-
-#ifdef VMSVGA3D_DIRECT3D
-/* Enable to use Wine to convert D3D to opengl */
-//#define VBOX_VMSVGA3D_WITH_WINE_OPENGL
-#endif
 
 
@@ -802 +797 @@
 #ifdef RT_OS_WINDOWS
 # ifdef VMSVGA3D_DIRECT3D
-#  ifdef VBOX_VMSVGA3D_WITH_WINE_OPENGL
-    IDirect3DDevice9       *pDevice;
-#  else
     IDirect3DDevice9Ex     *pDevice;
-#  endif
 # else
     /* Device context of the context window. */
@@ -1049 +1040 @@
 #ifdef RT_OS_WINDOWS
 # ifdef VMSVGA3D_DIRECT3D
-#  ifdef VBOX_VMSVGA3D_WITH_WINE_OPENGL
-    IDirect3D9             *pD3D9;
-#  else
     IDirect3D9Ex           *pD3D9;
-#  endif
     D3DCAPS9                caps;
     bool                    fSupportedSurfaceINTZ;

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

@@ -224 +224 @@
         return VINF_SUCCESS;    /* already initialized (load state) */
 
-#ifdef VBOX_VMSVGA3D_WITH_WINE_OPENGL
-    pState->pD3D9 = Direct3DCreate9(D3D_SDK_VERSION);
-    AssertReturn(pState->pD3D9, VERR_INTERNAL_ERROR);
-#else
     /* Direct3DCreate9Ex was introduced in Vista, so resolve it dynamically. */
     typedef HRESULT (WINAPI *PFNDIRECT3DCREATE9EX)(UINT, IDirect3D9Ex **);
@@ -236 +232 @@
     hr = pfnDirect3dCreate9Ex(D3D_SDK_VERSION, &pState->pD3D9);
     AssertReturn(hr == D3D_OK, VERR_INTERNAL_ERROR);
-#endif
+
     D3DADAPTER_IDENTIFIER9 ai9;
     hr = pState->pD3D9->GetAdapterIdentifier(D3DADAPTER_DEFAULT, 0, &ai9);
@@ -1339 +1335 @@
 {
     RT_NOREF(pState);
-#ifndef VBOX_VMSVGA3D_WITH_WINE_OPENGL
+
     Assert(pSurface->id != SVGA3D_INVALID_ID);
 
@@ -1372 +1368 @@
     hr = pSurface->pQuery->Issue(D3DISSUE_END);
     AssertMsgReturn(hr == D3D_OK, ("vmsvga3dSurfaceTrackUsage: Issue failed with %x\n", hr), VERR_INTERNAL_ERROR);
-#endif /* !VBOX_VMSVGA3D_WITH_WINE_OPENGL */
 
     return VINF_SUCCESS;
@@ -1399 +1394 @@
 int vmsvga3dSurfaceFlush(PVMSVGA3DSURFACE pSurface)
 {
-#ifndef VBOX_VMSVGA3D_WITH_WINE_OPENGL
     HRESULT hr;
 
@@ -1421 +1415 @@
 
     AssertMsgReturn(hr == S_OK, ("vmsvga3dSurfaceFinishDrawing: GetData failed with %x\n", hr), VERR_INTERNAL_ERROR);
-#endif /* !VBOX_VMSVGA3D_WITH_WINE_OPENGL */
 
     return VINF_SUCCESS;
@@ -1444 +1437 @@
        pTexture = pSurface->u.pTexture;
 
-#ifndef VBOX_VMSVGA3D_WITH_WINE_OPENGL
     if (pSurface->idAssociatedContext != pContext->id)
     {
@@ -1469 +1461 @@
         }
     }
-#else
-    RT_NOREF(pContext);
-#endif
 
     if (pSurface->enmD3DResType == VMSVGA3D_D3DRESTYPE_CUBE_TEXTURE)
@@ -2670 +2659 @@
     hr = Params.hrc;
 
-#elif defined(VBOX_VMSVGA3D_WITH_WINE_OPENGL)
-    hr = pState->pD3D9->CreateDevice(D3DADAPTER_DEFAULT,
-                                     D3DDEVTYPE_HAL,
-                                     pContext->hwnd,
-                                     D3DCREATE_MULTITHREADED | D3DCREATE_MIXED_VERTEXPROCESSING, //D3DCREATE_HARDWARE_VERTEXPROCESSING,
-                                     &PresParam,
-                                     &pContext->pDevice);
 #else
     /** @todo Docs indicates that we should be using
@@ -2864 +2846 @@
 static int vmsvga3dContextTrackUsage(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext)
 {
-#ifndef VBOX_VMSVGA3D_WITH_WINE_OPENGL
     PVMSVGA3DSTATE pState = pThisCC->svga.p3dState;
     AssertReturn(pState, VERR_NO_MEMORY);
@@ -2877 +2858 @@
         if (pContext->state.aRenderTargets[i] != SVGA3D_INVALID_ID)
             vmsvga3dSurfaceTrackUsageById(pState, pContext, pContext->state.aRenderTargets[i]);
-#endif
+
     return VINF_SUCCESS;
 }
@@ -3043 +3024 @@
             PresParam.PresentationInterval          = D3DPRESENT_INTERVAL_IMMEDIATE;;
 
-#ifdef VBOX_VMSVGA3D_WITH_WINE_OPENGL
-            hr = pContext->pDevice->Reset(&PresParam);
-            AssertMsgReturn(hr == D3D_OK, ("vmsvga3dChangeMode: Reset failed with %x\n", hr), VERR_INTERNAL_ERROR);
-#else
             /* ResetEx does not trash the device state */
             hr = pContext->pDevice->ResetEx(&PresParam, NULL);
             AssertMsgReturn(hr == D3D_OK, ("vmsvga3dChangeMode: Reset failed with %x\n", hr), VERR_INTERNAL_ERROR);
-#endif
+
             Log(("vmsvga3dChangeMode: Backbuffer (%d,%d) count=%d format=%x\n", PresParam.BackBufferWidth, PresParam.BackBufferHeight, PresParam.BackBufferCount, PresParam.BackBufferFormat));
 
@@ -4440 +4417 @@
                              VERR_INVALID_PARAMETER);
 
-#ifndef VBOX_VMSVGA3D_WITH_WINE_OPENGL
                 if (pSurface->idAssociatedContext != cid)
                 {
@@ -4451 +4427 @@
                 }
                 else
-#endif
                     hr = pContext->pDevice->SetTexture(d3dSampler, pSurface->u.pTexture);