Changeset 101082 in vbox

Timestamp:

Sep 11, 2023 3:53:22 PM (15 months ago)

Author:

vboxsync

Message:

WDDM: testcase update

Location:

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

Files:

• Makefile.kmk (modified) (1 diff)
• d3d11main.cpp (modified) (9 diffs)
• d3d11render.h (modified) (1 diff)

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

@@ -48 +48 @@
 PROGRAMS += VBoxD3D11
 VBoxD3D11_TEMPLATE    = VBoxR3Static
-VBoxD3D11_CXXFLAGS   += -wd4458 -wd4668 -wd4838 -wd5029 -wd5039
+VBoxD3D11_CXXFLAGS   += -wd4305 -wd4458 -wd4668 -wd4838 -wd5029 -wd5039
 VBoxD3D11_INCS       += $(PATH_ROOT)/src/VBox/Devices/Graphics/shaders
 VBoxD3D11_LIBS        = d3d11.lib

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

@@ -59 +59 @@
 
     HWND mHwnd;
+    UINT mRTWidth;
+    UINT mRTHeight;
 
     struct
@@ -93 +95 @@
     miRenderMode(RenderModeStep),
     mHwnd(0),
+    mRTWidth(0),
+    mRTHeight(0),
     mSharedHandle(0),
     mpRender(0)
@@ -280 +284 @@
     HRESULT hr = S_OK;
 
+    RECT clientRect;
+    GetClientRect(mHwnd, &clientRect);
+    mRTWidth = clientRect.right;
+    mRTHeight = clientRect.bottom;
+
     /*
      * Render.
@@ -290 +299 @@
         D3D11_TEXTURE2D_DESC texDesc;
         RT_ZERO(texDesc);
-        texDesc.Width     = 800;
-        texDesc.Height    = 600;
+        texDesc.Width     = mRTWidth;
+        texDesc.Height    = mRTHeight;
         texDesc.MipLevels = 1;
         texDesc.ArraySize = 1;
@@ -311 +320 @@
         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));
+        if (mpRender->IsDepthStencilBufferRequired(this))
+        {
+            D3D11_TEXTURE2D_DESC depthStencilDesc;
+            depthStencilDesc.Width     = mRTWidth;
+            depthStencilDesc.Height    = mRTHeight;
+            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));
+        }
     }
 
@@ -334 +346 @@
         mScreenViewport.TopLeftX = 0;
         mScreenViewport.TopLeftY = 0;
-        mScreenViewport.Width    = static_cast<float>(800);
-        mScreenViewport.Height   = static_cast<float>(600);
+        mScreenViewport.Width    = static_cast<float>(mRTWidth);
+        mScreenViewport.Height   = static_cast<float>(mRTHeight);
         mScreenViewport.MinDepth = 0.0f;
         mScreenViewport.MaxDepth = 1.0f;
@@ -352 +364 @@
         DXGI_SWAP_CHAIN_DESC sd;
         RT_ZERO(sd);
-        sd.BufferDesc.Width  = 800;
-        sd.BufferDesc.Height = 600;
+        sd.BufferDesc.Width  = mRTWidth;
+        sd.BufferDesc.Height = mRTHeight;
         sd.BufferDesc.RefreshRate.Numerator = 60;
         sd.BufferDesc.RefreshRate.Denominator = 1;
@@ -370 +382 @@
         HTEST(mOutput.pDxgiFactory->CreateSwapChain(mOutput.pDevice, &sd, &mOutput.pSwapChain));
 
-        HTEST(mOutput.pSwapChain->ResizeBuffers(1, 800, 600, DXGI_FORMAT_B8G8R8A8_UNORM, 0));
+        HTEST(mOutput.pSwapChain->ResizeBuffers(1, mRTWidth, mRTHeight, DXGI_FORMAT_B8G8R8A8_UNORM, 0));
 
         HTEST(mOutput.pDevice->OpenSharedResource(mSharedHandle, __uuidof(ID3D11Texture2D), (void**)&mOutput.pSharedTexture));
@@ -762 +774 @@
                          * Use the shared texture from the output device.
                          */
-                        float cDstWidth = 800.0f;
-                        float cDstHeight = 600.0f;
+                        float cDstWidth = static_cast<float>(mRTWidth);
+                        float cDstHeight = static_cast<float>(mRTHeight);
 
                         D3D11_RECT rectDst;
                         rectDst.left   = 0;
                         rectDst.top    = 0;
-                        rectDst.right  = 800;
-                        rectDst.bottom = 600;
+                        rectDst.right  = mRTWidth;
+                        rectDst.bottom = mRTHeight;
 
                         ID3D11ShaderResourceView *pShaderResourceView = 0;

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

@@ -86 +86 @@
     virtual HRESULT DoRender(D3D11DeviceProvider *pDP) = 0;
     virtual void TimeAdvance(float dt) { (void)dt; return; }
+    virtual bool IsDepthStencilBufferRequired(D3D11DeviceProvider *pDP) { (void)pDP; return true; }
 };