Changeset 95014 in vbox

Timestamp:

May 15, 2022 9:52:59 AM (3 years ago)

Author:

vboxsync

Message:

Devices/Graphics: 11.1 interfaces: bugref:9830

File:

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

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

@@ -72 +72 @@
 typedef struct DXDEVICE
 {
-    ID3D11Device               *pDevice;               /* Device. */
-    ID3D11DeviceContext        *pImmediateContext;     /* Corresponding context. */
+    ID3D11Device1              *pDevice;               /* Device. */
+    ID3D11DeviceContext1       *pImmediateContext;     /* Corresponding context. */
     IDXGIFactory               *pDxgiFactory;          /* DXGI Factory. */
     D3D_FEATURE_LEVEL           FeatureLevel;
@@ -821 +821 @@
 
 
-static int dxDeviceCreate(PVMSVGA3DBACKEND pBackend, DXDEVICE *pDevice)
+static int dxDeviceCreate(PVMSVGA3DBACKEND pBackend, DXDEVICE *pDXDevice)
 {
     int rc = VINF_SUCCESS;
@@ -827 +827 @@
     if (pBackend->fSingleDevice && pBackend->dxDevice.pDevice)
     {
-        pDevice->pDevice = pBackend->dxDevice.pDevice;
-        pDevice->pDevice->AddRef();
-
-        pDevice->pImmediateContext = pBackend->dxDevice.pImmediateContext;
-        pDevice->pImmediateContext->AddRef();
-
-        pDevice->pDxgiFactory = pBackend->dxDevice.pDxgiFactory;
-        pDevice->pDxgiFactory->AddRef();
-
-        pDevice->FeatureLevel = pBackend->dxDevice.FeatureLevel;
-
-        pDevice->pStagingBuffer = 0;
-        pDevice->cbStagingBuffer = 0;
+        pDXDevice->pDevice = pBackend->dxDevice.pDevice;
+        pDXDevice->pDevice->AddRef();
+
+        pDXDevice->pImmediateContext = pBackend->dxDevice.pImmediateContext;
+        pDXDevice->pImmediateContext->AddRef();
+
+        pDXDevice->pDxgiFactory = pBackend->dxDevice.pDxgiFactory;
+        pDXDevice->pDxgiFactory->AddRef();
+
+        pDXDevice->FeatureLevel = pBackend->dxDevice.FeatureLevel;
+
+        pDXDevice->pStagingBuffer = 0;
+        pDXDevice->cbStagingBuffer = 0;
 
         return rc;
@@ -855 +855 @@
 #endif
 
+    ID3D11Device *pDevice = 0;
+    ID3D11DeviceContext *pImmediateContext = 0;
     HRESULT hr = pBackend->pfnD3D11CreateDevice(pAdapter,
                                                 D3D_DRIVER_TYPE_HARDWARE,
@@ -862 +864 @@
                                                 RT_ELEMENTS(s_aFeatureLevels),
                                                 D3D11_SDK_VERSION,
-                                                &pDevice->pDevice,
-                                                &pDevice->FeatureLevel,
-                                                &pDevice->pImmediateContext);
+                                                &pDevice,
+                                                &pDXDevice->FeatureLevel,
+                                                &pImmediateContext);
     if (SUCCEEDED(hr))
     {
-        LogRel(("VMSVGA: Feature level %#x\n", pDevice->FeatureLevel));
+        LogRel(("VMSVGA: Feature level %#x\n", pDXDevice->FeatureLevel));
+
+        hr = pDevice->QueryInterface(__uuidof(ID3D11Device1), (void**)&pDXDevice->pDevice);
+        AssertReturnStmt(SUCCEEDED(hr),
+                         D3D_RELEASE(pImmediateContext); D3D_RELEASE(pDevice),
+                         VERR_NOT_SUPPORTED);
+
+        hr = pImmediateContext->QueryInterface(__uuidof(ID3D11DeviceContext1), (void**)&pDXDevice->pImmediateContext);
+        AssertReturnStmt(SUCCEEDED(hr),
+                         D3D_RELEASE(pImmediateContext); D3D_RELEASE(pDXDevice->pDevice); D3D_RELEASE(pDevice),
+                         VERR_NOT_SUPPORTED);
 
 #ifdef DEBUG
@@ -873 +885 @@
         HRESULT hr2;
         ID3D11Debug *pDebug = 0;
-        hr2 = pDevice->pDevice->QueryInterface(__uuidof(ID3D11Debug), (void**)&pDebug);
+        hr2 = pDXDevice->pDevice->QueryInterface(__uuidof(ID3D11Debug), (void**)&pDebug);
         if (SUCCEEDED(hr2))
         {
@@ -909 +921 @@
 
         IDXGIDevice *pDxgiDevice = 0;
-        hr = pDevice->pDevice->QueryInterface(__uuidof(IDXGIDevice), (void**)&pDxgiDevice);
+        hr = pDXDevice->pDevice->QueryInterface(__uuidof(IDXGIDevice), (void**)&pDxgiDevice);
         if (SUCCEEDED(hr))
         {
@@ -916 +928 @@
             if (SUCCEEDED(hr))
             {
-                hr = pDxgiAdapter->GetParent(__uuidof(IDXGIFactory), (void**)&pDevice->pDxgiFactory);
+                hr = pDxgiAdapter->GetParent(__uuidof(IDXGIFactory), (void**)&pDXDevice->pDxgiFactory);
                 D3D_RELEASE(pDxgiAdapter);
             }