Signed-off-by: Zebediah Figura zfigura@codeweavers.com --- dlls/d3d11/d3d11_private.h | 2 +- dlls/d3d11/device.c | 7 ++-- dlls/d3d11/state.c | 68 +++++++++++++++++++++++--------------- dlls/d3d11/tests/d3d11.c | 19 +++++++++++ 4 files changed, 65 insertions(+), 31 deletions(-)
diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index afbde9a4bfb..b45ef8431bf 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -461,7 +461,7 @@ struct d3d_depthstencil_state *unsafe_impl_from_ID3D10DepthStencilState( /* ID3D11RasterizerState, ID3D10RasterizerState */ struct d3d_rasterizer_state { - ID3D11RasterizerState ID3D11RasterizerState_iface; + ID3D11RasterizerState1 ID3D11RasterizerState1_iface; ID3D10RasterizerState ID3D10RasterizerState_iface; LONG refcount;
diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 626e4889708..c0191677e77 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2283,7 +2283,8 @@ static void STDMETHODCALLTYPE d3d11_device_context_RSGetState(ID3D11DeviceContex if ((wined3d_state = wined3d_device_context_get_rasterizer_state(context->wined3d_context))) { rasterizer_state_impl = wined3d_rasterizer_state_get_parent(wined3d_state); - ID3D11RasterizerState_AddRef(*rasterizer_state = &rasterizer_state_impl->ID3D11RasterizerState_iface); + *rasterizer_state = (ID3D11RasterizerState *)&rasterizer_state_impl->ID3D11RasterizerState1_iface; + ID3D11RasterizerState_AddRef(*rasterizer_state); } else { @@ -3604,7 +3605,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRasterizerState(ID3D11Device if (FAILED(hr = d3d_rasterizer_state_create(device, desc, &object))) return hr;
- *rasterizer_state = &object->ID3D11RasterizerState_iface; + *rasterizer_state = (ID3D11RasterizerState *)&object->ID3D11RasterizerState1_iface;
return S_OK; } @@ -4950,7 +4951,7 @@ static void STDMETHODCALLTYPE d3d10_device_RSSetState(ID3D10Device1 *iface, ID3D
rasterizer_state_object = unsafe_impl_from_ID3D10RasterizerState(rasterizer_state); d3d11_device_context_RSSetState(&device->immediate_context.ID3D11DeviceContext1_iface, - rasterizer_state_object ? &rasterizer_state_object->ID3D11RasterizerState_iface : NULL); + rasterizer_state_object ? (ID3D11RasterizerState *)&rasterizer_state_object->ID3D11RasterizerState1_iface : NULL); }
static void STDMETHODCALLTYPE d3d10_device_RSSetViewports(ID3D10Device1 *iface, diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 810217c93b4..9aa841f0805 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -841,23 +841,24 @@ struct d3d_depthstencil_state *unsafe_impl_from_ID3D10DepthStencilState(ID3D10De
/* ID3D11RasterizerState methods */
-static inline struct d3d_rasterizer_state *impl_from_ID3D11RasterizerState(ID3D11RasterizerState *iface) +static inline struct d3d_rasterizer_state *impl_from_ID3D11RasterizerState1(ID3D11RasterizerState1 *iface) { - return CONTAINING_RECORD(iface, struct d3d_rasterizer_state, ID3D11RasterizerState_iface); + return CONTAINING_RECORD(iface, struct d3d_rasterizer_state, ID3D11RasterizerState1_iface); }
-static HRESULT STDMETHODCALLTYPE d3d11_rasterizer_state_QueryInterface(ID3D11RasterizerState *iface, +static HRESULT STDMETHODCALLTYPE d3d11_rasterizer_state_QueryInterface(ID3D11RasterizerState1 *iface, REFIID riid, void **object) { - struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState(iface); + struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState1(iface);
TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object);
if (IsEqualGUID(riid, &IID_ID3D11RasterizerState) + || IsEqualGUID(riid, &IID_ID3D11RasterizerState1) || IsEqualGUID(riid, &IID_ID3D11DeviceChild) || IsEqualGUID(riid, &IID_IUnknown)) { - ID3D11RasterizerState_AddRef(iface); + ID3D11RasterizerState1_AddRef(iface); *object = iface; return S_OK; } @@ -876,9 +877,9 @@ static HRESULT STDMETHODCALLTYPE d3d11_rasterizer_state_QueryInterface(ID3D11Ras return E_NOINTERFACE; }
-static ULONG STDMETHODCALLTYPE d3d11_rasterizer_state_AddRef(ID3D11RasterizerState *iface) +static ULONG STDMETHODCALLTYPE d3d11_rasterizer_state_AddRef(ID3D11RasterizerState1 *iface) { - struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState(iface); + struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState1(iface); ULONG refcount = InterlockedIncrement(&state->refcount);
TRACE("%p increasing refcount to %u.\n", state, refcount); @@ -892,9 +893,9 @@ static ULONG STDMETHODCALLTYPE d3d11_rasterizer_state_AddRef(ID3D11RasterizerSta return refcount; }
-static ULONG STDMETHODCALLTYPE d3d11_rasterizer_state_Release(ID3D11RasterizerState *iface) +static ULONG STDMETHODCALLTYPE d3d11_rasterizer_state_Release(ID3D11RasterizerState1 *iface) { - struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState(iface); + struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState1(iface); ULONG refcount = InterlockedDecrement(&state->refcount);
TRACE("%p decreasing refcount to %u.\n", state, refcount); @@ -909,10 +910,10 @@ static ULONG STDMETHODCALLTYPE d3d11_rasterizer_state_Release(ID3D11RasterizerSt return refcount; }
-static void STDMETHODCALLTYPE d3d11_rasterizer_state_GetDevice(ID3D11RasterizerState *iface, +static void STDMETHODCALLTYPE d3d11_rasterizer_state_GetDevice(ID3D11RasterizerState1 *iface, ID3D11Device **device) { - struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState(iface); + struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState1(iface);
TRACE("iface %p, device %p.\n", iface, device);
@@ -920,47 +921,58 @@ static void STDMETHODCALLTYPE d3d11_rasterizer_state_GetDevice(ID3D11RasterizerS ID3D11Device_AddRef(*device); }
-static HRESULT STDMETHODCALLTYPE d3d11_rasterizer_state_GetPrivateData(ID3D11RasterizerState *iface, +static HRESULT STDMETHODCALLTYPE d3d11_rasterizer_state_GetPrivateData(ID3D11RasterizerState1 *iface, REFGUID guid, UINT *data_size, void *data) { - struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState(iface); + struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState1(iface);
TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data);
return d3d_get_private_data(&state->private_store, guid, data_size, data); }
-static HRESULT STDMETHODCALLTYPE d3d11_rasterizer_state_SetPrivateData(ID3D11RasterizerState *iface, +static HRESULT STDMETHODCALLTYPE d3d11_rasterizer_state_SetPrivateData(ID3D11RasterizerState1 *iface, REFGUID guid, UINT data_size, const void *data) { - struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState(iface); + struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState1(iface);
TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data);
return d3d_set_private_data(&state->private_store, guid, data_size, data); }
-static HRESULT STDMETHODCALLTYPE d3d11_rasterizer_state_SetPrivateDataInterface(ID3D11RasterizerState *iface, +static HRESULT STDMETHODCALLTYPE d3d11_rasterizer_state_SetPrivateDataInterface(ID3D11RasterizerState1 *iface, REFGUID guid, const IUnknown *data) { - struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState(iface); + struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState1(iface);
TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data);
return d3d_set_private_data_interface(&state->private_store, guid, data); }
-static void STDMETHODCALLTYPE d3d11_rasterizer_state_GetDesc(ID3D11RasterizerState *iface, +static void STDMETHODCALLTYPE d3d11_rasterizer_state_GetDesc(ID3D11RasterizerState1 *iface, D3D11_RASTERIZER_DESC *desc) { - struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState(iface); + struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState1(iface);
TRACE("iface %p, desc %p.\n", iface, desc);
*desc = state->desc; }
-static const struct ID3D11RasterizerStateVtbl d3d11_rasterizer_state_vtbl = +static void STDMETHODCALLTYPE d3d11_rasterizer_state_GetDesc1(ID3D11RasterizerState1 *iface, + D3D11_RASTERIZER_DESC1 *desc) +{ + struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState1(iface); + + TRACE("iface %p, desc %p.\n", iface, desc); + + memcpy(desc, &state->desc, sizeof(state->desc)); + desc->ForcedSampleCount = 0; +} + +static const struct ID3D11RasterizerState1Vtbl d3d11_rasterizer_state_vtbl = { /* IUnknown methods */ d3d11_rasterizer_state_QueryInterface, @@ -973,6 +985,8 @@ static const struct ID3D11RasterizerStateVtbl d3d11_rasterizer_state_vtbl = d3d11_rasterizer_state_SetPrivateDataInterface, /* ID3D11RasterizerState methods */ d3d11_rasterizer_state_GetDesc, + /* ID3D11RasterizerState1 methods */ + d3d11_rasterizer_state_GetDesc1, };
/* ID3D10RasterizerState methods */ @@ -991,7 +1005,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_QueryInterface(ID3D10Ras
TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object);
- return d3d11_rasterizer_state_QueryInterface(&state->ID3D11RasterizerState_iface, riid, object); + return d3d11_rasterizer_state_QueryInterface(&state->ID3D11RasterizerState1_iface, riid, object); }
static ULONG STDMETHODCALLTYPE d3d10_rasterizer_state_AddRef(ID3D10RasterizerState *iface) @@ -1000,7 +1014,7 @@ static ULONG STDMETHODCALLTYPE d3d10_rasterizer_state_AddRef(ID3D10RasterizerSta
TRACE("iface %p.\n", iface);
- return d3d11_rasterizer_state_AddRef(&state->ID3D11RasterizerState_iface); + return d3d11_rasterizer_state_AddRef(&state->ID3D11RasterizerState1_iface); }
static ULONG STDMETHODCALLTYPE d3d10_rasterizer_state_Release(ID3D10RasterizerState *iface) @@ -1009,7 +1023,7 @@ static ULONG STDMETHODCALLTYPE d3d10_rasterizer_state_Release(ID3D10RasterizerSt
TRACE("iface %p.\n", state);
- return d3d11_rasterizer_state_Release(&state->ID3D11RasterizerState_iface); + return d3d11_rasterizer_state_Release(&state->ID3D11RasterizerState1_iface); }
/* ID3D10DeviceChild methods */ @@ -1113,7 +1127,7 @@ static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, str struct wined3d_rasterizer_state_desc wined3d_desc; HRESULT hr;
- state->ID3D11RasterizerState_iface.lpVtbl = &d3d11_rasterizer_state_vtbl; + state->ID3D11RasterizerState1_iface.lpVtbl = &d3d11_rasterizer_state_vtbl; state->ID3D10RasterizerState_iface.lpVtbl = &d3d10_rasterizer_state_vtbl; state->refcount = 1; wined3d_private_store_init(&state->private_store); @@ -1175,7 +1189,7 @@ HRESULT d3d_rasterizer_state_create(struct d3d_device *device, const D3D11_RASTE object = WINE_RB_ENTRY_VALUE(entry, struct d3d_rasterizer_state, entry);
TRACE("Returning existing rasterizer state %p.\n", object); - ID3D11RasterizerState_AddRef(&object->ID3D11RasterizerState_iface); + ID3D11RasterizerState1_AddRef(&object->ID3D11RasterizerState1_iface); *state = object; wined3d_mutex_unlock();
@@ -1207,9 +1221,9 @@ struct d3d_rasterizer_state *unsafe_impl_from_ID3D11RasterizerState(ID3D11Raster { if (!iface) return NULL; - assert(iface->lpVtbl == &d3d11_rasterizer_state_vtbl); + assert(iface->lpVtbl == (ID3D11RasterizerStateVtbl *)&d3d11_rasterizer_state_vtbl);
- return impl_from_ID3D11RasterizerState(iface); + return impl_from_ID3D11RasterizerState1((ID3D11RasterizerState1 *)iface); }
struct d3d_rasterizer_state *unsafe_impl_from_ID3D10RasterizerState(ID3D10RasterizerState *iface) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 55a245c744c..cd4905e2a82 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -5507,6 +5507,7 @@ static void test_create_rasterizer_state(void) D3D10_RASTERIZER_DESC d3d10_desc; D3D11_RASTERIZER_DESC desc; ID3D11Device *device, *tmp; + ID3D11Device1 *device1; HRESULT hr;
if (!(device = create_device(NULL))) @@ -5570,6 +5571,24 @@ static void test_create_rasterizer_state(void) ok(refcount == 2, "Got unexpected refcount %u.\n", refcount); }
+ if (ID3D11Device_QueryInterface(device, &IID_ID3D11Device1, (void **)&device1) == S_OK) + { + ID3D11RasterizerState1 *state_ex1; + D3D11_RASTERIZER_DESC1 desc1; + + hr = ID3D11RasterizerState_QueryInterface(rast_state1, &IID_ID3D11RasterizerState1, (void **)&state_ex1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + memset(&desc1, 0xcc, sizeof(desc1)); + ID3D11RasterizerState1_GetDesc1(state_ex1, &desc1); + ok(!memcmp(&desc1, &desc, sizeof(desc)), "D3D11 desc didn't match.\n"); + ok(!desc1.ForcedSampleCount, "Got forced sample count %u.\n", desc1.ForcedSampleCount); + + ID3D11RasterizerState1_Release(state_ex1); + + ID3D11Device1_Release(device1); + } + refcount = ID3D11RasterizerState_Release(rast_state2); ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); refcount = ID3D11RasterizerState_Release(rast_state1);
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52294 Signed-off-by: Zebediah Figura zfigura@codeweavers.com --- dlls/d3d11/d3d11_private.h | 4 ++-- dlls/d3d11/device.c | 38 ++++++++++++++++++++++++++++++++------ dlls/d3d11/state.c | 19 +++++++++++-------- dlls/d3d11/tests/d3d11.c | 7 +++++++ 4 files changed, 52 insertions(+), 16 deletions(-)
diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index b45ef8431bf..41272d08da8 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -467,12 +467,12 @@ struct d3d_rasterizer_state
struct wined3d_private_store private_store; struct wined3d_rasterizer_state *wined3d_state; - D3D11_RASTERIZER_DESC desc; + D3D11_RASTERIZER_DESC1 desc; struct wine_rb_entry entry; ID3D11Device2 *device; };
-HRESULT d3d_rasterizer_state_create(struct d3d_device *device, const D3D11_RASTERIZER_DESC *desc, +HRESULT d3d_rasterizer_state_create(struct d3d_device *device, const D3D11_RASTERIZER_DESC1 *desc, struct d3d_rasterizer_state **state) 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; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index c0191677e77..eb8a7e65ccd 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3598,11 +3598,18 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRasterizerState(ID3D11Device { struct d3d_device *device = impl_from_ID3D11Device2(iface); struct d3d_rasterizer_state *object; + D3D11_RASTERIZER_DESC1 desc1; HRESULT hr;
TRACE("iface %p, desc %p, rasterizer_state %p.\n", iface, desc, rasterizer_state);
- if (FAILED(hr = d3d_rasterizer_state_create(device, desc, &object))) + if (!desc) + return E_INVALIDARG; + + memcpy(&desc1, desc, sizeof(*desc)); + desc1.ForcedSampleCount = 0; + + if (FAILED(hr = d3d_rasterizer_state_create(device, &desc1, &object))) return hr;
*rasterizer_state = (ID3D11RasterizerState *)&object->ID3D11RasterizerState1_iface; @@ -4210,9 +4217,21 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateBlendState1(ID3D11Device2 *i static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRasterizerState1(ID3D11Device2 *iface, const D3D11_RASTERIZER_DESC1 *desc, ID3D11RasterizerState1 **state) { - FIXME("iface %p, desc %p, state %p stub!\n", iface, desc, state); + struct d3d_device *device = impl_from_ID3D11Device2(iface); + struct d3d_rasterizer_state *object; + HRESULT hr;
- return E_NOTIMPL; + TRACE("iface %p, desc %p, state %p.\n", iface, desc, state); + + if (!desc) + return E_INVALIDARG; + + if (FAILED(hr = d3d_rasterizer_state_create(device, desc, &object))) + return hr; + + *state = &object->ID3D11RasterizerState1_iface; + + return S_OK; }
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeviceContextState(ID3D11Device2 *iface, UINT flags, @@ -6239,11 +6258,18 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRasterizerState(ID3D10Device { struct d3d_device *device = impl_from_ID3D10Device(iface); struct d3d_rasterizer_state *object; + D3D11_RASTERIZER_DESC1 desc1; HRESULT hr;
TRACE("iface %p, desc %p, rasterizer_state %p.\n", iface, desc, rasterizer_state);
- if (FAILED(hr = d3d_rasterizer_state_create(device, (const D3D11_RASTERIZER_DESC *)desc, &object))) + if (!desc) + return E_INVALIDARG; + + memcpy(&desc1, desc, sizeof(*desc)); + desc1.ForcedSampleCount = 0; + + if (FAILED(hr = d3d_rasterizer_state_create(device, &desc1, &object))) return hr;
*rasterizer_state = &object->ID3D10RasterizerState_iface; @@ -6779,8 +6805,8 @@ static int d3d_depthstencil_state_compare(const void *key, const struct wine_rb_
static int d3d_rasterizer_state_compare(const void *key, const struct wine_rb_entry *entry) { - const D3D11_RASTERIZER_DESC *ka = key; - const D3D11_RASTERIZER_DESC *kb = &WINE_RB_ENTRY_VALUE(entry, const struct d3d_rasterizer_state, entry)->desc; + const D3D11_RASTERIZER_DESC1 *ka = key; + const D3D11_RASTERIZER_DESC1 *kb = &WINE_RB_ENTRY_VALUE(entry, const struct d3d_rasterizer_state, entry)->desc;
return memcmp(ka, kb, sizeof(*ka)); } diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 9aa841f0805..bb12a93dec5 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -958,7 +958,7 @@ static void STDMETHODCALLTYPE d3d11_rasterizer_state_GetDesc(ID3D11RasterizerSta
TRACE("iface %p, desc %p.\n", iface, desc);
- *desc = state->desc; + memcpy(desc, &state->desc, sizeof(*desc)); }
static void STDMETHODCALLTYPE d3d11_rasterizer_state_GetDesc1(ID3D11RasterizerState1 *iface, @@ -968,8 +968,7 @@ static void STDMETHODCALLTYPE d3d11_rasterizer_state_GetDesc1(ID3D11RasterizerSt
TRACE("iface %p, desc %p.\n", iface, desc);
- memcpy(desc, &state->desc, sizeof(state->desc)); - desc->ForcedSampleCount = 0; + *desc = state->desc; }
static const struct ID3D11RasterizerState1Vtbl d3d11_rasterizer_state_vtbl = @@ -1122,7 +1121,7 @@ static enum wined3d_cull wined3d_cull_from_d3d11(D3D11_CULL_MODE mode) }
static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, struct d3d_device *device, - const D3D11_RASTERIZER_DESC *desc) + const D3D11_RASTERIZER_DESC1 *desc) { struct wined3d_rasterizer_state_desc wined3d_desc; HRESULT hr; @@ -1157,6 +1156,13 @@ static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, str FIXME("Ignoring MultisampleEnable %#x.\n", desc->MultisampleEnable); }
+ if (desc->ForcedSampleCount) + { + static unsigned int once; + if (!once++) + FIXME("Ignoring ForcedSampleCount %#x.\n", desc->ForcedSampleCount); + } + /* We cannot fail after creating a wined3d_rasterizer_state object. It * would lead to double free. */ if (FAILED(hr = wined3d_rasterizer_state_create(device->wined3d_device, &wined3d_desc, @@ -1173,16 +1179,13 @@ static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, str return S_OK; }
-HRESULT d3d_rasterizer_state_create(struct d3d_device *device, const D3D11_RASTERIZER_DESC *desc, +HRESULT d3d_rasterizer_state_create(struct d3d_device *device, const D3D11_RASTERIZER_DESC1 *desc, struct d3d_rasterizer_state **state) { struct d3d_rasterizer_state *object; struct wine_rb_entry *entry; HRESULT hr;
- if (!desc) - return E_INVALIDARG; - wined3d_mutex_lock(); if ((entry = wine_rb_get(&device->rasterizer_states, desc))) { diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index cd4905e2a82..298a2389555 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -5586,6 +5586,13 @@ static void test_create_rasterizer_state(void)
ID3D11RasterizerState1_Release(state_ex1);
+ memcpy(&desc1, &desc, sizeof(desc)); + desc1.ForcedSampleCount = 0; + hr = ID3D11Device1_CreateRasterizerState1(device1, &desc1, &state_ex1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ID3D11RasterizerState1_Release(state_ex1); + ID3D11Device1_Release(device1); }
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=105349
Your paranoid android.
=== w1064v1809 (32 bit report) ===
d3d11: d3d11.c:5950: Test failed: Got unexpected IAVertices count: 0. d3d11.c:5951: Test failed: Got unexpected IAPrimitives count: 0. d3d11.c:5952: Test failed: Got unexpected VSInvocations count: 0. d3d11.c:5955: Test failed: Got unexpected CInvocations count: 0. d3d11.c:5956: Test failed: Got unexpected CPrimitives count: 0.
=== w10pro64 (32 bit report) ===
d3d11: d3d11.c:5950: Test failed: Got unexpected IAVertices count: 0. d3d11.c:5951: Test failed: Got unexpected IAPrimitives count: 0. d3d11.c:5952: Test failed: Got unexpected VSInvocations count: 0. d3d11.c:5955: Test failed: Got unexpected CInvocations count: 0. d3d11.c:5956: Test failed: Got unexpected CPrimitives count: 0. d3d11.c:5795: Test failed: Got unexpected query result 0x0000000000000000.
=== debian11 (32 bit Arabic:Morocco report) ===
d3d11: d3d11.c:28286: Test failed: Got 0xffffffff, expected 0xff00ff00 at (639, 479, 0), sub-resource 0. d3d11.c:28295: Test failed: Got 0xffffffff, expected 0xff00ff00 at (639, 479, 0), sub-resource 0.
=== debian11 (32 bit German report) ===
d3d11: d3d11.c:28232: Test failed: Got 0xdeadbeef, expected 0xeff0f1f2 or 0x7f7f7f7f at 127, uvec4 0x7ffffff2, 0x7ffffff1, 0x7ffffff0, 0x7fffffef.
=== debian11 (32 bit Hindi:India report) ===
d3d11: d3d11.c:9800: Test failed: Got hr 0 for WRITE_NO_OVERWRITE. d3d11.c:28232: Test failed: d3d11.c:16465: Test marked todo: Got 0xdeadbeef, expected 0xc0b0a090 or 0x7f7f7f80 at 128, uvec4 0x8fffff90, 0x7fffffa0, 0x7fffffb0, 0x7fffffc0. d3d11.c:28232: Test failed: d3d11.c:16458: Line has been silenced after 42 occurrences
Signed-off-by: Henri Verbeet hverbeet@codeweavers.com
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=105348
Your paranoid android.
=== w8adm (32 bit report) ===
d3d11: d3d11.c:6273: Test failed: Got unexpected NumPrimitivesWritten: 4170035040. d3d11.c:6276: Test failed: Got unexpected PrimitivesStorageNeeded: 4170034328.