Commit 93418213 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard

d3d10: Implement d3d10_effect_rasterizer_variable_GetRasterizerState().

parent 14b9f3d2
...@@ -111,6 +111,7 @@ struct d3d10_effect_state_object_variable ...@@ -111,6 +111,7 @@ struct d3d10_effect_state_object_variable
} desc; } desc;
union union
{ {
ID3D10RasterizerState *rasterizer;
ID3D10DepthStencilState *depth_stencil; ID3D10DepthStencilState *depth_stencil;
ID3D10BlendState *blend; ID3D10BlendState *blend;
} object; } object;
......
...@@ -1581,6 +1581,11 @@ static HRESULT create_state_object(struct d3d10_effect_variable *v) ...@@ -1581,6 +1581,11 @@ static HRESULT create_state_object(struct d3d10_effect_variable *v)
break; break;
case D3D10_SVT_RASTERIZER: case D3D10_SVT_RASTERIZER:
if (FAILED(hr = ID3D10Device_CreateRasterizerState(device,
&v->u.state.desc.rasterizer, &v->u.state.object.rasterizer)))
return hr;
break;
case D3D10_SVT_SAMPLER: case D3D10_SVT_SAMPLER:
break; break;
...@@ -6486,9 +6491,25 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_rasterizer_variable_GetRawValue(ID ...@@ -6486,9 +6491,25 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_rasterizer_variable_GetRawValue(ID
static HRESULT STDMETHODCALLTYPE d3d10_effect_rasterizer_variable_GetRasterizerState(ID3D10EffectRasterizerVariable *iface, static HRESULT STDMETHODCALLTYPE d3d10_effect_rasterizer_variable_GetRasterizerState(ID3D10EffectRasterizerVariable *iface,
UINT index, ID3D10RasterizerState **rasterizer_state) UINT index, ID3D10RasterizerState **rasterizer_state)
{ {
FIXME("iface %p, index %u, rasterizer_state %p stub!\n", iface, index, rasterizer_state); struct d3d10_effect_variable *v = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface);
return E_NOTIMPL; TRACE("iface %p, index %u, rasterizer_state %p.\n", iface, index, rasterizer_state);
if (v->type->element_count)
v = impl_from_ID3D10EffectVariable(iface->lpVtbl->GetElement(iface, index));
else if (index)
return E_FAIL;
if (v->type->basetype != D3D10_SVT_RASTERIZER)
{
WARN("Variable is not a rasterizer state.\n");
return E_FAIL;
}
if ((*rasterizer_state = v->u.state.object.rasterizer))
ID3D10RasterizerState_AddRef(*rasterizer_state);
return S_OK;
} }
static HRESULT STDMETHODCALLTYPE d3d10_effect_rasterizer_variable_GetBackingStore(ID3D10EffectRasterizerVariable *iface, static HRESULT STDMETHODCALLTYPE d3d10_effect_rasterizer_variable_GetBackingStore(ID3D10EffectRasterizerVariable *iface,
......
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