wine-commits January 2022

wine-commits@winehq.org

2 participants
726 discussions

Henri Verbeet : d3d11/tests: Add some tests for ID3DUserDefinedAnnotation.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: 8305c597b95637dda04cde6025fbd6e5511ebcda URL: https://source.winehq.org/git/wine.git/?a=commit;h=8305c597b95637dda04cde60… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 25 11:51:41 2022 +0100 d3d11/tests: Add some tests for ID3DUserDefinedAnnotation. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 1e2f04a50ac..148043dc914 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -33994,6 +33994,46 @@ static void test_dynamic_map_synchronization(void) release_test_context(&test_context); } +static void test_user_defined_annotation(void) +{ + struct d3d11_test_context test_context; + ID3DUserDefinedAnnotation *annotation; + ID3D11DeviceContext *context; + HRESULT hr; + int ret; + + if (!init_test_context(&test_context, NULL)) + return; + + hr = ID3D11DeviceContext_QueryInterface(test_context.immediate_context, + &IID_ID3DUserDefinedAnnotation, (void **)&annotation); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ret = ID3DUserDefinedAnnotation_BeginEvent(annotation, L"Event 1"); + ok(ret == -1, "Got unexpected ret %d.\n", ret); + ret = ID3DUserDefinedAnnotation_EndEvent(annotation); + ok(ret == -1, "Got unexpected ret %d.\n", ret); + ID3DUserDefinedAnnotation_SetMarker(annotation, L"Marker 1"); + ret = ID3DUserDefinedAnnotation_GetStatus(annotation); + ok(!ret, "Got unexpected status %#x.\n", ret); + ID3DUserDefinedAnnotation_Release(annotation); + + hr = ID3D11Device_CreateDeferredContext(test_context.device, 0, &context); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_QueryInterface(context, &IID_ID3DUserDefinedAnnotation, (void **)&annotation); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ret = ID3DUserDefinedAnnotation_BeginEvent(annotation, L"Event 2"); + ok(ret == -1, "Got unexpected ret %d.\n", ret); + ret = ID3DUserDefinedAnnotation_EndEvent(annotation); + ok(ret == -1, "Got unexpected ret %d.\n", ret); + ID3DUserDefinedAnnotation_SetMarker(annotation, L"Marker 2"); + ret = ID3DUserDefinedAnnotation_GetStatus(annotation); + ok(!ret, "Got unexpected status %#x.\n", ret); + ID3DUserDefinedAnnotation_Release(annotation); + ID3D11DeviceContext_Release(context); + + release_test_context(&test_context); +} + START_TEST(d3d11) { unsigned int argc, i; @@ -34168,6 +34208,7 @@ START_TEST(d3d11) queue_test(test_texture_compressed_3d); queue_test(test_constant_buffer_offset); queue_test(test_dynamic_map_synchronization); + queue_test(test_user_defined_annotation); run_queued_tests();

1 0

Andrey Gusev : d3d11: Implement the ID3DUserDefinedAnnotation interface.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: 369ee8b0e184313ba4814604f7173a619dad9587 URL: https://source.winehq.org/git/wine.git/?a=commit;h=369ee8b0e184313ba4814604… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Jan 25 11:51:40 2022 +0100 d3d11: Implement the ID3DUserDefinedAnnotation interface. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51354 Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 1 + dlls/d3d11/device.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 41272d08da8..efe26551258 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -545,6 +545,7 @@ struct d3d11_device_context { ID3D11DeviceContext1 ID3D11DeviceContext1_iface; ID3D11Multithread ID3D11Multithread_iface; + ID3DUserDefinedAnnotation ID3DUserDefinedAnnotation_iface; LONG refcount; D3D11_DEVICE_CONTEXT_TYPE type; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index cb2969d8cf6..f0cbb1741ab 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -484,6 +484,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_context_QueryInterface(ID3D11Devic { *out = &context->ID3D11Multithread_iface; } + else if (IsEqualGUID(iid, &IID_ID3DUserDefinedAnnotation)) + { + *out = &context->ID3DUserDefinedAnnotation_iface; + } else { WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); @@ -3187,11 +3191,86 @@ static const struct ID3D11MultithreadVtbl d3d11_multithread_vtbl = d3d11_multithread_GetMultithreadProtected, }; +/* ID3DUserDefinedAnnotation methods */ + +static inline struct d3d11_device_context *impl_from_ID3DUserDefinedAnnotation(ID3DUserDefinedAnnotation *iface) +{ + return CONTAINING_RECORD(iface, struct d3d11_device_context, ID3DUserDefinedAnnotation_iface); +} + +static HRESULT STDMETHODCALLTYPE d3d11_user_defined_annotation_QueryInterface(ID3DUserDefinedAnnotation *iface, + REFIID iid, void **out) +{ + struct d3d11_device_context *context = impl_from_ID3DUserDefinedAnnotation(iface); + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + return d3d11_device_context_QueryInterface(&context->ID3D11DeviceContext1_iface, iid, out); +} + +static ULONG STDMETHODCALLTYPE d3d11_user_defined_annotation_AddRef(ID3DUserDefinedAnnotation *iface) +{ + struct d3d11_device_context *context = impl_from_ID3DUserDefinedAnnotation(iface); + + TRACE("iface %p.\n", iface); + + return d3d11_device_context_AddRef(&context->ID3D11DeviceContext1_iface); +} + +static ULONG STDMETHODCALLTYPE d3d11_user_defined_annotation_Release(ID3DUserDefinedAnnotation *iface) +{ + struct d3d11_device_context *context = impl_from_ID3DUserDefinedAnnotation(iface); + + TRACE("iface %p.\n", iface); + + return d3d11_device_context_Release(&context->ID3D11DeviceContext1_iface); +} + +static int STDMETHODCALLTYPE d3d11_user_defined_annotation_BeginEvent(ID3DUserDefinedAnnotation *iface, + const WCHAR *name) +{ + TRACE("iface %p, name %s.\n", iface, debugstr_w(name)); + + return -1; +} + +static int STDMETHODCALLTYPE d3d11_user_defined_annotation_EndEvent(ID3DUserDefinedAnnotation *iface) +{ + TRACE("iface %p.\n", iface); + + return -1; +} + +static void STDMETHODCALLTYPE d3d11_user_defined_annotation_SetMarker(ID3DUserDefinedAnnotation *iface, + const WCHAR *name) +{ + TRACE("iface %p, name %s.\n", iface, debugstr_w(name)); +} + +static BOOL STDMETHODCALLTYPE d3d11_user_defined_annotation_GetStatus(ID3DUserDefinedAnnotation *iface) +{ + TRACE("iface %p.\n", iface); + + return FALSE; +} + +static const struct ID3DUserDefinedAnnotationVtbl d3d11_user_defined_annotation_vtbl = +{ + d3d11_user_defined_annotation_QueryInterface, + d3d11_user_defined_annotation_AddRef, + d3d11_user_defined_annotation_Release, + d3d11_user_defined_annotation_BeginEvent, + d3d11_user_defined_annotation_EndEvent, + d3d11_user_defined_annotation_SetMarker, + d3d11_user_defined_annotation_GetStatus, +}; + static void d3d11_device_context_init(struct d3d11_device_context *context, struct d3d_device *device, D3D11_DEVICE_CONTEXT_TYPE type) { context->ID3D11DeviceContext1_iface.lpVtbl = &d3d11_device_context_vtbl; context->ID3D11Multithread_iface.lpVtbl = &d3d11_multithread_vtbl; + context->ID3DUserDefinedAnnotation_iface.lpVtbl = &d3d11_user_defined_annotation_vtbl; context->refcount = 1; context->type = type;

1 0

Jan Sikorski : wined3d: Acquire references to vertex buffers for command lists by inspecting CS packets.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: 6e0e2bef5db0c65515893ad2430317cda7eb16e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e0e2bef5db0c65515893ad2… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Tue Jan 25 11:51:39 2022 +0100 wined3d: Acquire references to vertex buffers for command lists by inspecting CS packets. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 224a52324b8..b268ce83ca0 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3671,6 +3671,19 @@ static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *pac break; } + case WINED3D_CS_OP_SET_STREAM_SOURCES: + { + struct wined3d_cs_set_stream_sources *op; + + op = (struct wined3d_cs_set_stream_sources *)packet->data; + for (i = 0; i < op->count; ++i) + { + if (op->streams[i].buffer) + wined3d_buffer_decref(op->streams[i].buffer); + } + break; + } + default: break; } @@ -3860,6 +3873,19 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) break; } + case WINED3D_CS_OP_SET_STREAM_SOURCES: + { + struct wined3d_cs_set_stream_sources *op; + + op = (struct wined3d_cs_set_stream_sources *)packet->data; + for (i = 0; i < op->count; ++i) + { + if (op->streams[i].buffer) + wined3d_buffer_incref(op->streams[i].buffer); + } + break; + } + default: break; }

1 0

Jan Sikorski : wined3d: Acquire references to stream output buffers for command lists by inspecting CS packets.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: c36351be1e5277b538e4974af7dfb75b723d2659 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c36351be1e5277b538e4974a… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Tue Jan 25 11:51:38 2022 +0100 wined3d: Acquire references to stream output buffers for command lists by inspecting CS packets. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index c46b38854c6..224a52324b8 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3658,6 +3658,19 @@ static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *pac break; } + case WINED3D_CS_OP_SET_STREAM_OUTPUTS: + { + struct wined3d_cs_set_stream_outputs *op; + + op = (struct wined3d_cs_set_stream_outputs *)packet->data; + for (i = 0; i < ARRAY_SIZE(op->outputs); ++i) + { + if (op->outputs[i].buffer) + wined3d_buffer_decref(op->outputs[i].buffer); + } + break; + } + default: break; } @@ -3834,6 +3847,19 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) break; } + case WINED3D_CS_OP_SET_STREAM_OUTPUTS: + { + struct wined3d_cs_set_stream_outputs *op; + + op = (struct wined3d_cs_set_stream_outputs *)packet->data; + for (i = 0; i < ARRAY_SIZE(op->outputs); ++i) + { + if (op->outputs[i].buffer) + wined3d_buffer_incref(op->outputs[i].buffer); + } + break; + } + default: break; }

1 0

Jan Sikorski : wined3d: Acquire references to index buffers for command lists by inspecting CS packets.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: 864135344234747e97df84139399e610929a25c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=864135344234747e97df8413… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Tue Jan 25 11:51:37 2022 +0100 wined3d: Acquire references to index buffers for command lists by inspecting CS packets. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 6fac275ccf1..c46b38854c6 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3648,6 +3648,16 @@ static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *pac break; } + case WINED3D_CS_OP_SET_INDEX_BUFFER: + { + struct wined3d_cs_set_index_buffer *op; + + op = (struct wined3d_cs_set_index_buffer *)packet->data; + if (op->buffer) + wined3d_buffer_decref(op->buffer); + break; + } + default: break; } @@ -3814,6 +3824,16 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) break; } + case WINED3D_CS_OP_SET_INDEX_BUFFER: + { + struct wined3d_cs_set_index_buffer *op; + + op = (struct wined3d_cs_set_index_buffer *)packet->data; + if (op->buffer) + wined3d_buffer_incref(op->buffer); + break; + } + default: break; }

1 0

Jan Sikorski : wined3d: Acquire references to indirect draw buffers for command lists by inspecting CS packets.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: 5f417adf18b90c951c90d11f099ba16641ce3d1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f417adf18b90c951c90d11f… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Tue Jan 25 11:51:36 2022 +0100 wined3d: Acquire references to indirect draw buffers for command lists by inspecting CS packets. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 80f9a973eaa..6fac275ccf1 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3639,6 +3639,15 @@ static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *pac break; } + case WINED3D_CS_OP_DRAW: + { + struct wined3d_cs_draw *op = (struct wined3d_cs_draw *)packet->data; + + if (op->parameters.indirect) + wined3d_buffer_decref(op->parameters.u.indirect.buffer); + break; + } + default: break; } @@ -3796,6 +3805,15 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) break; } + case WINED3D_CS_OP_DRAW: + { + struct wined3d_cs_draw *op = (struct wined3d_cs_draw *)packet->data; + + if (op->parameters.indirect) + wined3d_buffer_incref(op->parameters.u.indirect.buffer); + break; + } + default: break; }

1 0

Jan Sikorski : wined3d: Acquire references to indirect dispatch buffers for command lists by inspecting CS packets.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: 3fb9a8ea51587f77ce4b3aba1fa477cae1eb6679 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fb9a8ea51587f77ce4b3aba… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Tue Jan 25 11:51:35 2022 +0100 wined3d: Acquire references to indirect dispatch buffers for command lists by inspecting CS packets. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 9f7421e865f..80f9a973eaa 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3630,6 +3630,15 @@ static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *pac break; } + case WINED3D_CS_OP_DISPATCH: + { + struct wined3d_cs_dispatch *op = (struct wined3d_cs_dispatch *)packet->data; + + if (op->parameters.indirect) + wined3d_buffer_decref(op->parameters.u.indirect.buffer); + break; + } + default: break; } @@ -3778,6 +3787,15 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) break; } + case WINED3D_CS_OP_DISPATCH: + { + struct wined3d_cs_dispatch *op = (struct wined3d_cs_dispatch *)packet->data; + + if (op->parameters.indirect) + wined3d_buffer_incref(op->parameters.u.indirect.buffer); + break; + } + default: break; }

1 0

Paul Gofman : server: Release correct sockets in poll_socket().
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: 0839773db211192af0edf08472f78a178a8c671a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0839773db211192af0edf084… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jan 25 14:44:26 2022 +0300 server: Release correct sockets in poll_socket(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/sock.c b/server/sock.c index 650e67a2e0a..40fb0cac535 100644 --- a/server/sock.c +++ b/server/sock.c @@ -3046,7 +3046,7 @@ static void poll_socket( struct sock *poll_sock, struct async *async, int exclus req->sockets[i].sock = (struct sock *)get_handle_obj( current->process, sockets[i].socket, 0, &sock_ops ); if (!req->sockets[i].sock) { - for (j = 0; j < i; ++j) release_object( req->sockets[i].sock ); + for (j = 0; j < i; ++j) release_object( req->sockets[j].sock ); if (req->timeout) remove_timeout_user( req->timeout ); free( req ); return;

1 0

Nikolay Sivov : d3d10/effect: Fix index access in GetBlendState().
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: f0cb616fd9a4040f81667876e1d0d61336f3b717 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0cb616fd9a4040f81667876… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 25 12:13:33 2022 +0100 d3d10/effect: Fix index access in GetBlendState(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 12 +++++------- dlls/d3d10/tests/effect.c | 14 ++++++++++++++ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 96fd994fe77..e3c261d0270 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -8531,17 +8531,15 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_blend_variable_GetBlendState(ID3D1 TRACE("iface %p, index %u, blend_state %p.\n", iface, index, blend_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_BLEND) + if (!iface->lpVtbl->IsValid(iface)) { - WARN("Variable is not a blend state.\n"); + WARN("Invalid variable.\n"); return E_FAIL; } + if (!(v = d3d10_get_state_variable(v, index, &v->effect->blend_states))) + return E_FAIL; + if ((*blend_state = v->u.state.object.blend)) ID3D10BlendState_AddRef(*blend_state); diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 5c2e7766767..b4ea4402a05 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -4530,8 +4530,22 @@ static void test_effect_state_groups(void) blend_desc.RenderTargetWriteMask[0]); ok(blend_desc.RenderTargetWriteMask[7] == 0x7, "Got unexpected RenderTargetWriteMask[7] %#x.\n", blend_desc.RenderTargetWriteMask[7]); + hr = b->lpVtbl->GetBlendState(b, 0, &blend_state); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ID3D10BlendState_GetDesc(blend_state, &blend_desc); + ok(blend_desc.SrcBlend == D3D10_BLEND_ONE, "Got unexpected SrcBlend %#x.\n", blend_desc.SrcBlend); + ID3D10BlendState_Release(blend_state); b->lpVtbl->GetBackingStore(b, 1, &blend_desc); ok(blend_desc.SrcBlend == D3D10_BLEND_SRC_COLOR, "Got unexpected SrcBlend %#x.\n", blend_desc.SrcBlend); + hr = b->lpVtbl->GetBlendState(b, 1, &blend_state); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ID3D10BlendState_GetDesc(blend_state, &blend_desc); + /* We can't check the SrcBlend value from the ID3D10BlendState object + * descriptor because BlendEnable[0] is effectively false, which forces + * normalization of all the other descriptor values. We can at least + * confirm that we got blend_state2 by checking BlendEnable[0] itself. */ + ok(!blend_desc.BlendEnable[0], "Got unexpected BlendEnable[0] %#x.\n", blend_desc.BlendEnable[0]); + ID3D10BlendState_Release(blend_state); v = effect->lpVtbl->GetVariableByName(effect, "ds_state"); d = v->lpVtbl->AsDepthStencil(v);

1 0

Nikolay Sivov : d3d10/effect: Fix index access in GetDepthStencilState().
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: bf89b610d365cd778809e0a9cf957fc9e8f5df84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf89b610d365cd778809e0a9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 21 10:26:27 2022 +0300 d3d10/effect: Fix index access in GetDepthStencilState(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 12 +++++------- dlls/d3d10/tests/effect.c | 10 ++++++++++ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index fb6c1ed58ad..96fd994fe77 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -8772,17 +8772,15 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_depth_stencil_variable_GetDepthSte TRACE("iface %p, index %u, depth_stencil_state %p.\n", iface, index, depth_stencil_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_DEPTHSTENCIL) + if (!iface->lpVtbl->IsValid(iface)) { - WARN("Variable is not a depth stencil state.\n"); + WARN("Invalid variable.\n"); return E_FAIL; } + if (!(v = d3d10_get_state_variable(v, index, &v->effect->ds_states))) + return E_FAIL; + if ((*depth_stencil_state = v->u.state.object.depth_stencil)) ID3D10DepthStencilState_AddRef(*depth_stencil_state); diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 32a154bf276..5c2e7766767 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -4559,8 +4559,18 @@ static void test_effect_state_groups(void) ds_desc.BackFace.StencilPassOp); ok(ds_desc.BackFace.StencilFunc == D3D10_COMPARISON_GREATER_EQUAL, "Got unexpected BackFaceStencilFunc %#x.\n", ds_desc.BackFace.StencilFunc); + hr = d->lpVtbl->GetDepthStencilState(d, 0, &ds_state); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ID3D10DepthStencilState_GetDesc(ds_state, &ds_desc); + ok(ds_desc.DepthEnable, "Got unexpected DepthEnable %#x.\n", ds_desc.DepthEnable); + ID3D10DepthStencilState_Release(ds_state); d->lpVtbl->GetBackingStore(d, 1, &ds_desc); ok(!ds_desc.DepthEnable, "Got unexpected DepthEnable %#x.\n", ds_desc.DepthEnable); + hr = d->lpVtbl->GetDepthStencilState(d, 1, &ds_state); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ID3D10DepthStencilState_GetDesc(ds_state, &ds_desc); + ok(!ds_desc.DepthEnable, "Got unexpected DepthEnable %#x.\n", ds_desc.DepthEnable); + ID3D10DepthStencilState_Release(ds_state); v = effect->lpVtbl->GetVariableByName(effect, "rast_state"); r = v->lpVtbl->AsRasterizer(v);

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
73
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2022