ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3d10/effect: Set shader masks in ComputeStateBlockMask() for passes. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2021-10-06 10:53:33 +03:00 committed by Alexandre Julliard
parent a3942ae20e
commit c85e46b102
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dlls/d3d10/effect.c
View File

@ -4113,9 +4113,18 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_Apply(ID3D10EffectPass *iface
static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_ComputeStateBlockMask(ID3D10EffectPass *iface, static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_ComputeStateBlockMask(ID3D10EffectPass *iface,
D3D10_STATE_BLOCK_MASK *mask) D3D10_STATE_BLOCK_MASK *mask)
{ {
FIXME("iface %p, mask %p stub!\n", iface, mask); struct d3d10_effect_pass *pass = impl_from_ID3D10EffectPass(iface);
return E_NOTIMPL; FIXME("iface %p, mask %p semi-stub!\n", iface, mask);
if (pass->vs.shader != &null_shader_variable)
D3D10StateBlockMaskEnableCapture(mask, D3D10_DST_VS, 0, 1);
if (pass->ps.shader != &null_shader_variable)
D3D10StateBlockMaskEnableCapture(mask, D3D10_DST_PS, 0, 1);
if (pass->gs.shader != &null_shader_variable)
D3D10StateBlockMaskEnableCapture(mask, D3D10_DST_GS, 0, 1);
return S_OK;
} }
static const struct ID3D10EffectPassVtbl d3d10_effect_pass_vtbl = static const struct ID3D10EffectPassVtbl d3d10_effect_pass_vtbl =

4
dlls/d3d10/tests/effect.c
View File

@ -3016,7 +3016,6 @@ if (0)
hr = D3D10StateBlockMaskDisableAll(&mask); hr = D3D10StateBlockMaskDisableAll(&mask);
ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
hr = p->lpVtbl->ComputeStateBlockMask(p, &mask); hr = p->lpVtbl->ComputeStateBlockMask(p, &mask);
todo_wine
ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_VS, 0); ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_VS, 0);
ok(!ret, "Unexpected mask.\n"); ok(!ret, "Unexpected mask.\n");
@ -3164,7 +3163,6 @@ todo_wine
hr = D3D10StateBlockMaskDisableAll(&mask); hr = D3D10StateBlockMaskDisableAll(&mask);
ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
hr = p->lpVtbl->ComputeStateBlockMask(p, &mask); hr = p->lpVtbl->ComputeStateBlockMask(p, &mask);
todo_wine {
ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_VS, 0); ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_VS, 0);
ok(ret, "Unexpected mask.\n"); ok(ret, "Unexpected mask.\n");
@ -3172,7 +3170,7 @@ todo_wine {
ok(ret, "Unexpected mask.\n"); ok(ret, "Unexpected mask.\n");
ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_GS, 0); ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_GS, 0);
ok(ret, "Unexpected mask.\n"); ok(ret, "Unexpected mask.\n");
}
/* pass 2 */ /* pass 2 */
p = t->lpVtbl->GetPassByIndex(t, 2); p = t->lpVtbl->GetPassByIndex(t, 2);