Commit 5639edd2 authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard

d3d10/effect: Fix iteration in GetBackingStore() for depth stencil states.

parent f4d40a73
...@@ -8796,21 +8796,20 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_depth_stencil_variable_GetBackingS ...@@ -8796,21 +8796,20 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_depth_stencil_variable_GetBackingS
TRACE("iface %p, index %u, desc %p.\n", iface, index, desc); TRACE("iface %p, index %u, desc %p.\n", iface, index, desc);
if (v->type->element_count) if (!iface->lpVtbl->IsValid(iface))
v = impl_from_ID3D10EffectVariable(iface->lpVtbl->GetElement(iface, index));
if (v->type->basetype != D3D10_SVT_DEPTHSTENCIL)
{ {
WARN("Variable is not a depth stencil state.\n"); WARN("Invalid variable.\n");
return E_FAIL; return E_FAIL;
} }
if (!(v = d3d10_get_state_variable(v, index, &v->effect->ds_states)))
return E_FAIL;
*desc = v->u.state.desc.depth_stencil; *desc = v->u.state.desc.depth_stencil;
return S_OK; return S_OK;
} }
static const struct ID3D10EffectDepthStencilVariableVtbl d3d10_effect_depth_stencil_variable_vtbl = static const struct ID3D10EffectDepthStencilVariableVtbl d3d10_effect_depth_stencil_variable_vtbl =
{ {
/* ID3D10EffectVariable methods */ /* ID3D10EffectVariable methods */
......
...@@ -4548,6 +4548,8 @@ static void test_effect_state_groups(void) ...@@ -4548,6 +4548,8 @@ static void test_effect_state_groups(void)
ds_desc.BackFace.StencilPassOp); ds_desc.BackFace.StencilPassOp);
ok(ds_desc.BackFace.StencilFunc == D3D10_COMPARISON_GREATER_EQUAL, "Got unexpected BackFaceStencilFunc %#x.\n", ok(ds_desc.BackFace.StencilFunc == D3D10_COMPARISON_GREATER_EQUAL, "Got unexpected BackFaceStencilFunc %#x.\n",
ds_desc.BackFace.StencilFunc); ds_desc.BackFace.StencilFunc);
d->lpVtbl->GetBackingStore(d, 1, &ds_desc);
ok(!ds_desc.DepthEnable, "Got unexpected DepthEnable %#x.\n", ds_desc.DepthEnable);
v = effect->lpVtbl->GetVariableByName(effect, "rast_state"); v = effect->lpVtbl->GetVariableByName(effect, "rast_state");
r = v->lpVtbl->AsRasterizer(v); r = v->lpVtbl->AsRasterizer(v);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment