Changeset 95081 in vbox

Timestamp:

May 24, 2022 5:24:22 PM (3 years ago)

Author:

vboxsync

Message:

WDDM: D3D testcase update

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/gallium/test

Files:

• d3d11main.cpp (modified) (7 diffs)
• d3d11render.cpp (modified) (1 diff)
• d3d11render.h (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/gallium/test/d3d11main.cpp

@@ -32 +32 @@
     virtual ID3D11DeviceContext *ImmediateContext();
     virtual ID3D11RenderTargetView *RenderTargetView();
+    virtual ID3D11DepthStencilView *DepthStencilView();
 
 private:
@@ -58 +59 @@
         IDXGIResource          *pDxgiResource;         /* Interface of the render target. */
         IDXGIKeyedMutex        *pDXGIKeyedMutex;       /* Synchronization interface for the render device. */
+        ID3D11Texture2D        *pDepthStencilBuffer;
+        ID3D11DepthStencilView *pDepthStencilView;
     } mRender;
 
@@ -192 +195 @@
         D3D_FEATURE_LEVEL_11_1,
         D3D_FEATURE_LEVEL_11_0,
+        D3D_FEATURE_LEVEL_10_1,
+        D3D_FEATURE_LEVEL_10_0,
         D3D_FEATURE_LEVEL_9_3,
+        D3D_FEATURE_LEVEL_9_2,
+        D3D_FEATURE_LEVEL_9_1
     };
     UINT Flags = D3D11_CREATE_DEVICE_BGRA_SUPPORT;
@@ -200 +207 @@
     D3D_FEATURE_LEVEL FeatureLevel = D3D_FEATURE_LEVEL_9_1;
 
-    HTEST(D3D11CreateDevice(pAdapter,
-                            D3D_DRIVER_TYPE_HARDWARE,
-                            NULL,
-                            Flags,
-                            aFeatureLevels,
-                            RT_ELEMENTS(aFeatureLevels),
-                            D3D11_SDK_VERSION,
-                            ppDevice,
-                            &FeatureLevel,
-                            ppImmediateContext));
+    hr = D3D11CreateDevice(pAdapter,
+                           D3D_DRIVER_TYPE_HARDWARE,
+                           NULL,
+                           Flags,
+                           aFeatureLevels,
+                           RT_ELEMENTS(aFeatureLevels),
+                           D3D11_SDK_VERSION,
+                           ppDevice,
+                           &FeatureLevel,
+                           ppImmediateContext);
+    if (FAILED(hr) && RT_BOOL(Flags & D3D11_CREATE_DEVICE_DEBUG))
+    {
+        /* Device creation may fail because _DEBUG flag requires "D3D11 SDK Layers for Windows 10" ("Graphics Tools"):
+         *   Settings/System/Apps/Optional features/Add a feature/Graphics Tools
+         * Retry without the flag.
+         */
+        Flags &= ~D3D11_CREATE_DEVICE_DEBUG;
+        hr = D3D11CreateDevice(pAdapter,
+                               D3D_DRIVER_TYPE_HARDWARE,
+                               NULL,
+                               Flags,
+                               aFeatureLevels,
+                               RT_ELEMENTS(aFeatureLevels),
+                               D3D11_SDK_VERSION,
+                               ppDevice,
+                               &FeatureLevel,
+                               ppImmediateContext);
+    }
+    D3DAssertHR(hr);
 
     if (FeatureLevel != D3D_FEATURE_LEVEL_11_1)
     {
-        D3DTestShowError(hr, "FeatureLevel");
+        char s[128];
+        sprintf(s, "Feature level %x", FeatureLevel);
+        D3DTestShowError(hr, s);
     }
 
@@ -272 +300 @@
 
         HTEST(mRender.pRenderTarget->QueryInterface(__uuidof(IDXGIKeyedMutex), (LPVOID*)&mRender.pDXGIKeyedMutex));
+
+        D3D11_TEXTURE2D_DESC depthStencilDesc;
+        depthStencilDesc.Width     = 800;
+        depthStencilDesc.Height    = 600;
+        depthStencilDesc.MipLevels = 1;
+        depthStencilDesc.ArraySize = 1;
+        depthStencilDesc.Format    = DXGI_FORMAT_D24_UNORM_S8_UINT;
+        depthStencilDesc.SampleDesc.Count   = 1;
+        depthStencilDesc.SampleDesc.Quality = 0;
+        depthStencilDesc.Usage          = D3D11_USAGE_DEFAULT;
+        depthStencilDesc.BindFlags      = D3D11_BIND_DEPTH_STENCIL;
+        depthStencilDesc.CPUAccessFlags = 0;
+        depthStencilDesc.MiscFlags      = 0;
+
+        HTEST(mRender.pDevice->CreateTexture2D(&depthStencilDesc, 0, &mRender.pDepthStencilBuffer));
+        HTEST(mRender.pDevice->CreateDepthStencilView(mRender.pDepthStencilBuffer, 0, &mRender.pDepthStencilView));
     }
 
@@ -465 +509 @@
                      * Use the shared texture from the render device.
                      */
-                    mRender.pImmediateContext->OMSetRenderTargets(1, &mRender.pRenderTargetView, NULL);
+                    mRender.pImmediateContext->OMSetRenderTargets(1, &mRender.pRenderTargetView, mRender.pDepthStencilView);
                     mpRender->DoRender(this);
                 }
@@ -545 +589 @@
 }
 
+ID3D11DepthStencilView *D3D11Test::DepthStencilView()
+{
+    return mRender.pDepthStencilView;
+}
+
 int WINAPI WinMain(HINSTANCE hInstance,
                    HINSTANCE hPrevInstance,

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/gallium/test/d3d11render.cpp

@@ -270 +270 @@
     FLOAT aColor[4] = { 1.0f, 1.0f, 1.0f, 1.0f };
     pImmediateContext->ClearRenderTargetView(pDP->RenderTargetView(), aColor);
+    if (pDP->DepthStencilView())
+        pImmediateContext->ClearDepthStencilView(pDP->DepthStencilView(),
+                                                 D3D11_CLEAR_DEPTH | D3D11_CLEAR_STENCIL, 1.0f, 0);
 
     pImmediateContext->IASetInputLayout(mpInputLayout);

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/gallium/test/d3d11render.h

@@ -60 +60 @@
     virtual ID3D11DeviceContext *ImmediateContext() = 0;
     virtual ID3D11RenderTargetView *RenderTargetView() = 0;
+    virtual ID3D11DepthStencilView *DepthStencilView() = 0;
 };