[PATCH 3/6] d3d11: Implement d3d11_immediate_context_RSSetState().
Józef Kucia
jkucia at codeweavers.com
Thu Nov 5 18:28:25 CST 2015
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
---
dlls/d3d11/d3d11_private.h | 1 +
dlls/d3d11/device.c | 69 +++++++++++++++++++++++++---------------------
dlls/d3d11/state.c | 9 ++++++
3 files changed, 48 insertions(+), 31 deletions(-)
diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h
index fb3bb45..d99a18a 100644
--- a/dlls/d3d11/d3d11_private.h
+++ b/dlls/d3d11/d3d11_private.h
@@ -332,6 +332,7 @@ struct d3d_rasterizer_state
HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, struct d3d_device *device,
const D3D11_RASTERIZER_DESC *desc) DECLSPEC_HIDDEN;
+struct d3d_rasterizer_state *unsafe_impl_from_ID3D11RasterizerState(ID3D11RasterizerState *iface) DECLSPEC_HIDDEN;
struct d3d_rasterizer_state *unsafe_impl_from_ID3D10RasterizerState(ID3D10RasterizerState *iface) DECLSPEC_HIDDEN;
/* ID3D11SamplerState, ID3D10SamplerState */
diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
index 936fd36..f276eaa 100644
--- a/dlls/d3d11/device.c
+++ b/dlls/d3d11/device.c
@@ -501,7 +501,40 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DispatchIndirect(ID3D11Dev
static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceContext *iface,
ID3D11RasterizerState *rasterizer_state)
{
- FIXME("iface %p, rasterizer_state %p stub!\n", iface, rasterizer_state);
+ struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface);
+ const D3D11_RASTERIZER_DESC *desc;
+
+ TRACE("iface %p, rasterizer_state %p.\n", iface, rasterizer_state);
+
+ wined3d_mutex_lock();
+ if (!(device->rasterizer_state = unsafe_impl_from_ID3D11RasterizerState(rasterizer_state)))
+ {
+ wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_FILLMODE, WINED3D_FILL_SOLID);
+ wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_CULLMODE, WINED3D_CULL_CCW);
+ wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SCISSORTESTENABLE, FALSE);
+ wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEANTIALIAS, FALSE);
+ wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ANTIALIASEDLINEENABLE, FALSE);
+ wined3d_mutex_unlock();
+ return;
+ }
+
+ desc = &device->rasterizer_state->desc;
+ wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_FILLMODE, desc->FillMode);
+ wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_CULLMODE, desc->CullMode);
+ /* glFrontFace() */
+ if (desc->FrontCounterClockwise)
+ FIXME("Ignoring FrontCounterClockwise %#x.\n", desc->FrontCounterClockwise);
+ /* OpenGL style depth bias. */
+ if (desc->DepthBias || desc->SlopeScaledDepthBias)
+ FIXME("Ignoring depth bias.\n");
+ /* GL_DEPTH_CLAMP */
+ if (!desc->DepthClipEnable)
+ FIXME("Ignoring DepthClipEnable %#x.\n", desc->DepthClipEnable);
+ wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SCISSORTESTENABLE, desc->ScissorEnable);
+ wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEANTIALIAS, desc->MultisampleEnable);
+ wined3d_device_set_render_state(device->wined3d_device,
+ WINED3D_RS_ANTIALIASEDLINEENABLE, desc->AntialiasedLineEnable);
+ wined3d_mutex_unlock();
}
static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetViewports(ID3D11DeviceContext *iface,
@@ -2504,39 +2537,13 @@ static void STDMETHODCALLTYPE d3d10_device_DrawAuto(ID3D10Device1 *iface)
static void STDMETHODCALLTYPE d3d10_device_RSSetState(ID3D10Device1 *iface, ID3D10RasterizerState *rasterizer_state)
{
struct d3d_device *device = impl_from_ID3D10Device(iface);
- const D3D11_RASTERIZER_DESC *desc;
+ struct d3d_rasterizer_state *rasterizer_state_object;
TRACE("iface %p, rasterizer_state %p.\n", iface, rasterizer_state);
- wined3d_mutex_lock();
- if (!(device->rasterizer_state = unsafe_impl_from_ID3D10RasterizerState(rasterizer_state)))
- {
- wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_FILLMODE, WINED3D_FILL_SOLID);
- wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_CULLMODE, WINED3D_CULL_CCW);
- wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SCISSORTESTENABLE, FALSE);
- wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEANTIALIAS, FALSE);
- wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ANTIALIASEDLINEENABLE, FALSE);
- wined3d_mutex_unlock();
- return;
- }
-
- desc = &device->rasterizer_state->desc;
- wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_FILLMODE, desc->FillMode);
- wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_CULLMODE, desc->CullMode);
- /* glFrontFace() */
- if (desc->FrontCounterClockwise)
- FIXME("Ignoring FrontCounterClockwise %#x.\n", desc->FrontCounterClockwise);
- /* OpenGL style depth bias. */
- if (desc->DepthBias || desc->SlopeScaledDepthBias)
- FIXME("Ignoring depth bias.\n");
- /* GL_DEPTH_CLAMP */
- if (!desc->DepthClipEnable)
- FIXME("Ignoring DepthClipEnable %#x.\n", desc->DepthClipEnable);
- wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SCISSORTESTENABLE, desc->ScissorEnable);
- wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEANTIALIAS, desc->MultisampleEnable);
- wined3d_device_set_render_state(device->wined3d_device,
- WINED3D_RS_ANTIALIASEDLINEENABLE, desc->AntialiasedLineEnable);
- wined3d_mutex_unlock();
+ rasterizer_state_object = unsafe_impl_from_ID3D10RasterizerState(rasterizer_state);
+ d3d11_immediate_context_RSSetState(&device->immediate_context.ID3D11DeviceContext_iface,
+ rasterizer_state_object ? &rasterizer_state_object->ID3D11RasterizerState_iface : NULL);
}
static void STDMETHODCALLTYPE d3d10_device_RSSetViewports(ID3D10Device1 *iface,
diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c
index 502ed9a..8c7b752 100644
--- a/dlls/d3d11/state.c
+++ b/dlls/d3d11/state.c
@@ -863,6 +863,15 @@ HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, struct d3d
return S_OK;
}
+struct d3d_rasterizer_state *unsafe_impl_from_ID3D11RasterizerState(ID3D11RasterizerState *iface)
+{
+ if (!iface)
+ return NULL;
+ assert(iface->lpVtbl == &d3d11_rasterizer_state_vtbl);
+
+ return impl_from_ID3D11RasterizerState(iface);
+}
+
struct d3d_rasterizer_state *unsafe_impl_from_ID3D10RasterizerState(ID3D10RasterizerState *iface)
{
if (!iface)
--
2.4.10
More information about the wine-patches
mailing list