Henri Verbeet : d3d10core: Implement d3d10_rasterizer_state_GetDesc().
Alexandre Julliard
julliard at winehq.org
Wed Jan 2 14:18:38 CST 2013
Module: wine
Branch: master
Commit: 4f9814c5368cdbf4d3d745a34158e59a1f38defa
URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f9814c5368cdbf4d3d745a34158e59a1f38defa
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Wed Jan 2 12:07:26 2013 +0100
d3d10core: Implement d3d10_rasterizer_state_GetDesc().
---
dlls/d3d10core/d3d10core_private.h | 5 ++++-
dlls/d3d10core/device.c | 6 ++++--
dlls/d3d10core/state.c | 9 +++++++--
3 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h
index b5ba293..ede3b7a 100644
--- a/dlls/d3d10core/d3d10core_private.h
+++ b/dlls/d3d10core/d3d10core_private.h
@@ -247,9 +247,12 @@ struct d3d10_rasterizer_state
{
ID3D10RasterizerState ID3D10RasterizerState_iface;
LONG refcount;
+
+ D3D10_RASTERIZER_DESC desc;
};
-HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state) DECLSPEC_HIDDEN;
+HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state,
+ const D3D10_RASTERIZER_DESC *desc) DECLSPEC_HIDDEN;
struct d3d10_rasterizer_state *unsafe_impl_from_ID3D10RasterizerState(ID3D10RasterizerState *iface) DECLSPEC_HIDDEN;
/* ID3D10SamplerState */
diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c
index bcf49da..3542d53 100644
--- a/dlls/d3d10core/device.c
+++ b/dlls/d3d10core/device.c
@@ -1480,6 +1480,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRasterizerState(ID3D10Device
TRACE("iface %p, desc %p, rasterizer_state %p.\n", iface, desc, rasterizer_state);
+ if (!desc)
+ return E_INVALIDARG;
+
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object));
if (!object)
{
@@ -1487,8 +1490,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRasterizerState(ID3D10Device
return E_OUTOFMEMORY;
}
- hr = d3d10_rasterizer_state_init(object);
- if (FAILED(hr))
+ if (FAILED(hr = d3d10_rasterizer_state_init(object, desc)))
{
WARN("Failed to initialize rasterizer state, hr %#x.\n", hr);
HeapFree(GetProcessHeap(), 0, object);
diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c
index b2aebdc..f49875d 100644
--- a/dlls/d3d10core/state.c
+++ b/dlls/d3d10core/state.c
@@ -392,7 +392,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_SetPrivateDataInterface(
static void STDMETHODCALLTYPE d3d10_rasterizer_state_GetDesc(ID3D10RasterizerState *iface,
D3D10_RASTERIZER_DESC *desc)
{
- FIXME("iface %p, desc %p stub!\n", iface, desc);
+ struct d3d10_rasterizer_state *state = impl_from_ID3D10RasterizerState(iface);
+
+ TRACE("iface %p, desc %p.\n", iface, desc);
+
+ *desc = state->desc;
}
static const struct ID3D10RasterizerStateVtbl d3d10_rasterizer_state_vtbl =
@@ -410,10 +414,11 @@ static const struct ID3D10RasterizerStateVtbl d3d10_rasterizer_state_vtbl =
d3d10_rasterizer_state_GetDesc,
};
-HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state)
+HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state, const D3D10_RASTERIZER_DESC *desc)
{
state->ID3D10RasterizerState_iface.lpVtbl = &d3d10_rasterizer_state_vtbl;
state->refcount = 1;
+ state->desc = *desc;
return S_OK;
}
More information about the wine-cvs
mailing list