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

Timestamp:

Dec 7, 2023 5:56:09 PM (14 months ago)

Author:

vboxsync

Message:

Devices/Graphics: use 11.1 interfaces.

File:

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

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

@@ -90 +90 @@
 typedef struct D3D11BLITTER
 {
-    ID3D11Device           *pDevice;
-    ID3D11DeviceContext    *pImmediateContext;
+    ID3D11Device1          *pDevice;
+    ID3D11DeviceContext1   *pImmediateContext;
 
     ID3D11VertexShader     *pVertexShader;
     ID3D11PixelShader      *pPixelShader;
     ID3D11SamplerState     *pSamplerState;
-    ID3D11RasterizerState  *pRasterizerState;
-    ID3D11BlendState       *pBlendState;
+    ID3D11RasterizerState1 *pRasterizerState;
+    ID3D11BlendState1      *pBlendState;
 } D3D11BLITTER;
 
@@ -349 +349 @@
     uint32_t                   cStreamOutput;          /* paStreamOutput */
     uint32_t                   cUnorderedAccessView;   /* paUnorderedAccessView */
-    ID3D11BlendState         **papBlendState;
+    ID3D11BlendState1        **papBlendState;
     ID3D11DepthStencilState  **papDepthStencilState;
     ID3D11SamplerState       **papSamplerState;
-    ID3D11RasterizerState    **papRasterizerState;
+    ID3D11RasterizerState1   **papRasterizerState;
     DXELEMENTLAYOUT           *paElementLayout;
     DXVIEW                    *paRenderTargetView;
@@ -420 +420 @@
 static void dxDestroyVideoDecoder(DXVIDEODECODER *pDXVideoDecoder);
 
-static HRESULT BlitInit(D3D11BLITTER *pBlitter, ID3D11Device *pDevice, ID3D11DeviceContext *pImmediateContext);
+static HRESULT BlitInit(D3D11BLITTER *pBlitter, ID3D11Device1 *pDevice, ID3D11DeviceContext1 *pImmediateContext);
 static void BlitRelease(D3D11BLITTER *pBlitter);
 
@@ -1912 +1912 @@
 
 
+static D3D11_LOGIC_OP dxLogicOp(uint8_t svgaLogicEq)
+{
+    return (D3D11_LOGIC_OP)svgaLogicEq;
+}
+
+
 /** @todo AssertCompile for types like D3D11_COMPARISON_FUNC and SVGA3dComparisonFunc */
-static HRESULT dxBlendStateCreate(DXDEVICE *pDevice, SVGACOTableDXBlendStateEntry const *pEntry, ID3D11BlendState **pp)
-{
-    D3D11_BLEND_DESC BlendDesc;
+static HRESULT dxBlendStateCreate(DXDEVICE *pDevice, SVGACOTableDXBlendStateEntry const *pEntry, ID3D11BlendState1 **pp)
+{
+    D3D11_BLEND_DESC1 BlendDesc;
     BlendDesc.AlphaToCoverageEnable = RT_BOOL(pEntry->alphaToCoverageEnable);
     BlendDesc.IndependentBlendEnable = RT_BOOL(pEntry->independentBlendEnable);
@@ -1921 +1927 @@
     {
         BlendDesc.RenderTarget[i].BlendEnable           = RT_BOOL(pEntry->perRT[i].blendEnable);
+        BlendDesc.RenderTarget[i].LogicOpEnable         = RT_BOOL(pEntry->perRT[i].logicOpEnable);
         BlendDesc.RenderTarget[i].SrcBlend              = dxBlendFactorColor(pEntry->perRT[i].srcBlend);
         BlendDesc.RenderTarget[i].DestBlend             = dxBlendFactorColor(pEntry->perRT[i].destBlend);
@@ -1927 +1934 @@
         BlendDesc.RenderTarget[i].DestBlendAlpha        = dxBlendFactorAlpha(pEntry->perRT[i].destBlendAlpha);
         BlendDesc.RenderTarget[i].BlendOpAlpha          = dxBlendOp         (pEntry->perRT[i].blendOpAlpha);
+        BlendDesc.RenderTarget[i].LogicOp               = dxLogicOp         (pEntry->perRT[i].logicOp);
         BlendDesc.RenderTarget[i].RenderTargetWriteMask = pEntry->perRT[i].renderTargetWriteMask;
-        /** @todo logicOpEnable and logicOp */
-    }
-
-    HRESULT hr = pDevice->pDevice->CreateBlendState(&BlendDesc, pp);
+    }
+
+    HRESULT hr = pDevice->pDevice->CreateBlendState1(&BlendDesc, pp);
     Assert(SUCCEEDED(hr));
     return hr;
@@ -1999 +2006 @@
 
 
-static HRESULT dxRasterizerStateCreate(DXDEVICE *pDevice, SVGACOTableDXRasterizerStateEntry const *pEntry, ID3D11RasterizerState **pp)
-{
-    D3D11_RASTERIZER_DESC desc;
+static D3D11_CULL_MODE dxCullMode(uint8_t svgaCullMode)
+{
+    return (D3D11_CULL_MODE)svgaCullMode;
+}
+
+
+static HRESULT dxRasterizerStateCreate(DXDEVICE *pDevice, SVGACOTableDXRasterizerStateEntry const *pEntry, ID3D11RasterizerState1 **pp)
+{
+    D3D11_RASTERIZER_DESC1 desc;
     desc.FillMode              = dxFillMode(pEntry->fillMode);
-    desc.CullMode              = (D3D11_CULL_MODE)pEntry->cullMode;
+    desc.CullMode              = dxCullMode(pEntry->cullMode);
     desc.FrontCounterClockwise = pEntry->frontCounterClockwise;
     /** @todo provokingVertexLast */
@@ -2013 +2026 @@
     desc.MultisampleEnable     = pEntry->multisampleEnable;
     desc.AntialiasedLineEnable = pEntry->antialiasedLineEnable;
-    /** @todo lineWidth lineStippleEnable lineStippleFactor lineStipplePattern forcedSampleCount */
-
-    HRESULT hr = pDevice->pDevice->CreateRasterizerState(&desc, pp);
+    desc.ForcedSampleCount     = pEntry->forcedSampleCount;
+    /** @todo lineWidth lineStippleEnable lineStippleFactor lineStipplePattern */
+
+    HRESULT hr = pDevice->pDevice->CreateRasterizerState1(&desc, pp);
     Assert(SUCCEEDED(hr));
     return hr;
@@ -7845 +7859 @@
     if (blendId != SVGA3D_INVALID_ID)
     {
-        ID3D11BlendState *pBlendState = pDXContext->pBackendDXContext->papBlendState[blendId];
+        ID3D11BlendState1 *pBlendState = pDXContext->pBackendDXContext->papBlendState[blendId];
         pDevice->pImmediateContext->OMSetBlendState(pBlendState, blendFactor, sampleMask);
     }
@@ -7885 +7899 @@
     if (rasterizerId != SVGA3D_INVALID_ID)
     {
-        ID3D11RasterizerState *pRasterizerState = pDXContext->pBackendDXContext->papRasterizerState[rasterizerId];
+        ID3D11RasterizerState1 *pRasterizerState = pDXContext->pBackendDXContext->papRasterizerState[rasterizerId];
         pDevice->pImmediateContext->RSSetState(pRasterizerState);
     }
@@ -8497 +8511 @@
 
 
-static HRESULT BlitInit(D3D11BLITTER *pBlitter, ID3D11Device *pDevice, ID3D11DeviceContext *pImmediateContext)
+static HRESULT BlitInit(D3D11BLITTER *pBlitter, ID3D11Device1 *pDevice, ID3D11DeviceContext1 *pImmediateContext)
 {
     HRESULT hr;
@@ -8525 +8539 @@
     HTEST(pBlitter->pDevice->CreateSamplerState(&SamplerDesc, &pBlitter->pSamplerState));
 
-    D3D11_RASTERIZER_DESC RasterizerDesc;
+    D3D11_RASTERIZER_DESC1 RasterizerDesc;
     RasterizerDesc.FillMode              = D3D11_FILL_SOLID;
     RasterizerDesc.CullMode              = D3D11_CULL_NONE;
@@ -8536 +8550 @@
     RasterizerDesc.MultisampleEnable     = FALSE;
     RasterizerDesc.AntialiasedLineEnable = FALSE;
-    HTEST(pBlitter->pDevice->CreateRasterizerState(&RasterizerDesc, &pBlitter->pRasterizerState));
-
-    D3D11_BLEND_DESC BlendDesc;
+    RasterizerDesc.ForcedSampleCount     = 0;
+    HTEST(pBlitter->pDevice->CreateRasterizerState1(&RasterizerDesc, &pBlitter->pRasterizerState));
+
+    D3D11_BLEND_DESC1 BlendDesc;
     BlendDesc.AlphaToCoverageEnable = FALSE;
     BlendDesc.IndependentBlendEnable = FALSE;
@@ -8544 +8559 @@
     {
         BlendDesc.RenderTarget[i].BlendEnable           = FALSE;
+        BlendDesc.RenderTarget[i].LogicOpEnable         = FALSE;
         BlendDesc.RenderTarget[i].SrcBlend              = D3D11_BLEND_SRC_COLOR;
         BlendDesc.RenderTarget[i].DestBlend             = D3D11_BLEND_ZERO;
@@ -8550 +8566 @@
         BlendDesc.RenderTarget[i].DestBlendAlpha        = D3D11_BLEND_ZERO;
         BlendDesc.RenderTarget[i].BlendOpAlpha          = D3D11_BLEND_OP_ADD;
+        BlendDesc.RenderTarget[i].LogicOp               = D3D11_LOGIC_OP_CLEAR;
         BlendDesc.RenderTarget[i].RenderTargetWriteMask = 0xF;
     }
-    HTEST(pBlitter->pDevice->CreateBlendState(&BlendDesc, &pBlitter->pBlendState));
+    HTEST(pBlitter->pDevice->CreateBlendState1(&BlendDesc, &pBlitter->pBlendState));
 
     return S_OK;