d3d10/effect: Set state block masks for state variables.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Matteo Bruni <mbruni@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

d3d10/effect: Set state block masks for state variables.
e893e6e2 · Nikolay Sivov · Alexandre Julliard · 47350f36 · e893e6e2 · e893e6e2
Commit e893e6e2 authored Oct 06, 2021 by Nikolay Sivov Committed by Alexandre Julliard Oct 07, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

effect.c dlls/d3d10/effect.c +6 -0

effect.c dlls/d3d10/tests/effect.c +0 -3

No files found.
--- a/dlls/d3d10/effect.c
+++ b/dlls/d3d10/effect.c
@@ -4157,6 +4157,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_ComputeStateBlockMask(ID3D10E
        D3D10StateBlockMaskEnableCapture(mask, D3D10_DST_PS, 0, 1);
    if (pass->gs.shader != &null_shader_variable)
        D3D10StateBlockMaskEnableCapture(mask, D3D10_DST_GS, 0, 1);
+    if (pass->rasterizer)
+        D3D10StateBlockMaskEnableCapture(mask, D3D10_DST_RS_RASTERIZER_STATE, 0, 1);
+    if (pass->depth_stencil)
+        D3D10StateBlockMaskEnableCapture(mask, D3D10_DST_OM_DEPTH_STENCIL_STATE, 0, 1);
+    if (pass->blend)
+        D3D10StateBlockMaskEnableCapture(mask, D3D10_DST_OM_BLEND_STATE, 0, 1);

    return S_OK;
 }

--- a/dlls/d3d10/tests/effect.c
+++ b/dlls/d3d10/tests/effect.c
@@ -4331,13 +4331,10 @@ static void test_effect_state_groups(void)
    hr = pass->lpVtbl->ComputeStateBlockMask(pass, &mask);
    ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
    ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_RS_RASTERIZER_STATE, 0);
-todo_wine
    ok(ret, "Unexpected mask.\n");
    ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_OM_DEPTH_STENCIL_STATE, 0);
-todo_wine
    ok(ret, "Unexpected mask.\n");
    ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_OM_BLEND_STATE, 0);
-todo_wine
    ok(ret, "Unexpected mask.\n");

    hr = pass->lpVtbl->Apply(pass, 0);