January 2022 - Wine-Commits

Stefan Dösinger : d3d11/tests: Ignore random WARP failures in test_pipeline_statistics_query.
by Alexandre Julliard Jan. 20, 2022

Jan. 20, 2022

Module: wine Branch: master Commit: d741742e327cb0a68a63ab49b1a632ede02bd689 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d741742e327cb0a68a63ab49… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 20 10:40:14 2022 +0300 d3d11/tests: Ignore random WARP failures in test_pipeline_statistics_query. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 4b06ba2c4d8..0ab38e366d3 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -5900,6 +5900,7 @@ static void test_occlusion_query(void) static void test_pipeline_statistics_query(void) { + static const D3D11_QUERY_DATA_PIPELINE_STATISTICS zero_data = {0}; static const struct vec4 red = {1.0f, 0.0f, 0.0f, 1.0f}; static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; @@ -5947,18 +5948,29 @@ static void test_pipeline_statistics_query(void) ID3D11DeviceContext_End(context, query); get_query_data(context, query, &data, sizeof(data)); - ok(data.IAVertices == 4, "Got unexpected IAVertices count: %u.\n", (unsigned int)data.IAVertices); - ok(data.IAPrimitives == 2, "Got unexpected IAPrimitives count: %u.\n", (unsigned int)data.IAPrimitives); - ok(data.VSInvocations == 4, "Got unexpected VSInvocations count: %u.\n", (unsigned int)data.VSInvocations); - ok(!data.GSInvocations, "Got unexpected GSInvocations count: %u.\n", (unsigned int)data.GSInvocations); - ok(!data.GSPrimitives, "Got unexpected GSPrimitives count: %u.\n", (unsigned int)data.GSPrimitives); - ok(data.CInvocations == 2, "Got unexpected CInvocations count: %u.\n", (unsigned int)data.CInvocations); - ok(data.CPrimitives == 2, "Got unexpected CPrimitives count: %u.\n", (unsigned int)data.CPrimitives); - todo_wine - ok(!data.PSInvocations, "Got unexpected PSInvocations count: %u.\n", (unsigned int)data.PSInvocations); - ok(!data.HSInvocations, "Got unexpected HSInvocations count: %u.\n", (unsigned int)data.HSInvocations); - ok(!data.DSInvocations, "Got unexpected DSInvocations count: %u.\n", (unsigned int)data.DSInvocations); - ok(!data.CSInvocations, "Got unexpected CSInvocations count: %u.\n", (unsigned int)data.CSInvocations); + + /* WARP devices randomly return all-zeroed structures as if the draw did not happen. Flushing and + * sleeping a second before ending the query reduces the likelyhood of hitting the bug a lot, but + * does not eliminate it entirely. To make things work reliably ignore such broken results. */ + if (is_warp_device(device) && !memcmp(&data, &zero_data, sizeof(data))) + { + win_skip("WARP device randomly returns zeroed query results.\n"); + } + else + { + ok(data.IAVertices == 4, "Got unexpected IAVertices count: %u.\n", (unsigned int)data.IAVertices); + ok(data.IAPrimitives == 2, "Got unexpected IAPrimitives count: %u.\n", (unsigned int)data.IAPrimitives); + ok(data.VSInvocations == 4, "Got unexpected VSInvocations count: %u.\n", (unsigned int)data.VSInvocations); + ok(!data.GSInvocations, "Got unexpected GSInvocations count: %u.\n", (unsigned int)data.GSInvocations); + ok(!data.GSPrimitives, "Got unexpected GSPrimitives count: %u.\n", (unsigned int)data.GSPrimitives); + ok(data.CInvocations == 2, "Got unexpected CInvocations count: %u.\n", (unsigned int)data.CInvocations); + ok(data.CPrimitives == 2, "Got unexpected CPrimitives count: %u.\n", (unsigned int)data.CPrimitives); + todo_wine + ok(!data.PSInvocations, "Got unexpected PSInvocations count: %u.\n", (unsigned int)data.PSInvocations); + ok(!data.HSInvocations, "Got unexpected HSInvocations count: %u.\n", (unsigned int)data.HSInvocations); + ok(!data.DSInvocations, "Got unexpected DSInvocations count: %u.\n", (unsigned int)data.DSInvocations); + ok(!data.CSInvocations, "Got unexpected CSInvocations count: %u.\n", (unsigned int)data.CSInvocations); + } ID3D11DeviceContext_Begin(context, query); draw_color_quad(&test_context, &red);

1 0

Nikolay Sivov : d3d10/effect: Store state variables references in their own arrays.
by Alexandre Julliard Jan. 20, 2022

Jan. 20, 2022

Module: wine Branch: master Commit: 2c665f79a74f1479df71ce2eff891186f62aff8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c665f79a74f1479df71ce2e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 19 13:29:07 2022 +0300 d3d10/effect: Store state variables references in their own arrays. 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/d3d10_private.h | 1 + dlls/d3d10/effect.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 924ed94426c..4ccbb81f78d 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -127,6 +127,7 @@ struct d3d10_effect_state_object_variable ID3D10SamplerState *sampler; IUnknown *object; } object; + unsigned int index; struct d3d10_effect_prop_dependencies dependencies; }; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 3b3196a2168..ba7c3590b64 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -3024,6 +3024,7 @@ static HRESULT create_state_object(struct d3d10_effect_variable *v) static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, const char **ptr, BOOL shared_type_desc, struct d3d10_effect_variable *v) { + struct d3d10_effect_var_array *vars; struct d3d10_effect_variable *var; unsigned int i, j, element_count; HRESULT hr; @@ -3137,12 +3138,38 @@ static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, return E_FAIL; } + switch (v->type->basetype) + { + case D3D10_SVT_DEPTHSTENCIL: + vars = &v->effect->ds_states; + break; + case D3D10_SVT_BLEND: + vars = &v->effect->blend_states; + break; + case D3D10_SVT_RASTERIZER: + vars = &v->effect->rs_states; + break; + case D3D10_SVT_SAMPLER: + vars = &v->effect->samplers; + break; + default: + ; + } + for (i = 0; i < element_count; ++i) { unsigned int prop_count; var = d3d10_array_get_element(v, i); + if (vars->current >= vars->count) + { + WARN("Wrong variable array size for %#x.\n", v->type->basetype); + return E_FAIL; + } + var->u.state.index = vars->current; + vars->v[vars->current++] = var; + read_dword(ptr, &prop_count); TRACE("State object property count: %#x.\n", prop_count); @@ -3558,6 +3585,30 @@ static HRESULT parse_fx10_body(struct d3d10_effect *e, const char *data, DWORD d return E_OUTOFMEMORY; } + if (!(e->samplers.v = heap_calloc(e->samplers.count, sizeof(*e->samplers.v)))) + { + ERR("Failed to allocate samplers array.\n"); + return E_OUTOFMEMORY; + } + + if (!(e->blend_states.v = heap_calloc(e->blend_states.count, sizeof(*e->blend_states.v)))) + { + ERR("Failed to allocate blend states array.\n"); + return E_OUTOFMEMORY; + } + + if (!(e->ds_states.v = heap_calloc(e->ds_states.count, sizeof(*e->ds_states.v)))) + { + ERR("Failed to allocate depth stencil states array.\n"); + return E_OUTOFMEMORY; + } + + if (!(e->rs_states.v = heap_calloc(e->rs_states.count, sizeof(*e->rs_states.v)))) + { + ERR("Failed to allocate rasterizer states array.\n"); + return E_OUTOFMEMORY; + } + if (!(e->techniques = heap_calloc(e->technique_count, sizeof(*e->techniques)))) { ERR("Failed to allocate techniques memory\n");

1 0

Gabriel Ivăncescu : ddraw: Use WINED3D_SWAPCHAIN_NO_WINDOW_CHANGES also if DDSCL_NOWINDOWCHANGES is set.
by Alexandre Julliard Jan. 20, 2022

Jan. 20, 2022

Module: wine Branch: master Commit: f8ac8752ed635d8114971f7c27b30661441ae3a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8ac8752ed635d8114971f7c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Jan 18 18:50:26 2022 +0200 ddraw: Use WINED3D_SWAPCHAIN_NO_WINDOW_CHANGES also if DDSCL_NOWINDOWCHANGES is set. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 14 +++++----- dlls/ddraw/tests/ddraw1.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 267 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f8ac8752ed635d811497…

1 0

Nikolay Sivov : d3d10/effect: Fix iteration in GetBackingStore() for sampler states.
by Alexandre Julliard Jan. 20, 2022

Jan. 20, 2022

Module: wine Branch: master Commit: 1f7b3283aae4e68989722f6d1597e3e3b7ed1aea URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f7b3283aae4e68989722f6d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 19 13:29:08 2022 +0300 d3d10/effect: Fix iteration in GetBackingStore() for sampler states. 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 | 25 +++- dlls/d3d10/tests/effect.c | 319 +++++++++++++++++++++++++--------------------- 2 files changed, 194 insertions(+), 150 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1f7b3283aae4e6898972…

1 0

Nikolay Sivov : d3d10/effect: Add arrays for all state variables.
by Alexandre Julliard Jan. 20, 2022

Jan. 20, 2022

Module: wine Branch: master Commit: a6f027fe2c4d5cd94110336813ed8912f49639ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6f027fe2c4d5cd941103368… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 19 13:29:06 2022 +0300 d3d10/effect: Add arrays for all state variables. 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/d3d10_private.h | 12 +++---- dlls/d3d10/effect.c | 82 +++++++++++++++++++++++++--------------------- 2 files changed, 50 insertions(+), 44 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 88bfd48bc3d..924ed94426c 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -288,12 +288,6 @@ struct d3d10_effect DWORD technique_count; DWORD index_offset; DWORD texture_count; - DWORD depthstencilstate_count; - DWORD blendstate_count; - DWORD rasterizerstate_count; - DWORD samplerstate_count; - DWORD rendertargetview_count; - DWORD depthstencilview_count; DWORD anonymous_shader_count; DWORD flags; @@ -304,6 +298,12 @@ struct d3d10_effect struct d3d10_effect_variable *local_variables; struct d3d10_effect_anonymous_shader *anonymous_shaders; struct d3d10_effect_var_array shaders; + struct d3d10_effect_var_array samplers; + struct d3d10_effect_var_array rtvs; + struct d3d10_effect_var_array dsvs; + struct d3d10_effect_var_array blend_states; + struct d3d10_effect_var_array ds_states; + struct d3d10_effect_var_array rs_states; struct d3d10_effect_technique *techniques; }; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index d70be57e8ac..3b3196a2168 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -3680,23 +3680,23 @@ static HRESULT parse_fx10(struct d3d10_effect *e, const char *data, DWORD data_s read_dword(&ptr, &e->texture_count); TRACE("Texture count: %u\n", e->texture_count); - read_dword(&ptr, &e->depthstencilstate_count); - TRACE("Depthstencilstate count: %u\n", e->depthstencilstate_count); + read_dword(&ptr, &e->ds_states.count); + TRACE("Depthstencilstate count: %u\n", e->ds_states.count); - read_dword(&ptr, &e->blendstate_count); - TRACE("Blendstate count: %u\n", e->blendstate_count); + read_dword(&ptr, &e->blend_states.count); + TRACE("Blendstate count: %u\n", e->blend_states.count); - read_dword(&ptr, &e->rasterizerstate_count); - TRACE("Rasterizerstate count: %u\n", e->rasterizerstate_count); + read_dword(&ptr, &e->rs_states.count); + TRACE("Rasterizerstate count: %u\n", e->rs_states.count); - read_dword(&ptr, &e->samplerstate_count); - TRACE("Samplerstate count: %u\n", e->samplerstate_count); + read_dword(&ptr, &e->samplers.count); + TRACE("Samplerstate count: %u\n", e->samplers.count); - read_dword(&ptr, &e->rendertargetview_count); - TRACE("Rendertargetview count: %u\n", e->rendertargetview_count); + read_dword(&ptr, &e->rtvs.count); + TRACE("Rendertargetview count: %u\n", e->rtvs.count); - read_dword(&ptr, &e->depthstencilview_count); - TRACE("Depthstencilview count: %u\n", e->depthstencilview_count); + read_dword(&ptr, &e->dsvs.count); + TRACE("Depthstencilview count: %u\n", e->dsvs.count); read_dword(&ptr, &e->shaders.count); TRACE("Used shader count: %u\n", e->shaders.count); @@ -3953,60 +3953,66 @@ static ULONG STDMETHODCALLTYPE d3d10_effect_AddRef(ID3D10Effect *iface) static ULONG STDMETHODCALLTYPE d3d10_effect_Release(ID3D10Effect *iface) { - struct d3d10_effect *This = impl_from_ID3D10Effect(iface); - ULONG refcount = InterlockedDecrement(&This->refcount); + struct d3d10_effect *effect = impl_from_ID3D10Effect(iface); + ULONG refcount = InterlockedDecrement(&effect->refcount); - TRACE("%p decreasing refcount to %u\n", This, refcount); + TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) { unsigned int i; - if (This->techniques) + if (effect->techniques) { - for (i = 0; i < This->technique_count; ++i) + for (i = 0; i < effect->technique_count; ++i) { - d3d10_effect_technique_destroy(&This->techniques[i]); + d3d10_effect_technique_destroy(&effect->techniques[i]); } - heap_free(This->techniques); + heap_free(effect->techniques); } - if (This->local_variables) + if (effect->local_variables) { - for (i = 0; i < This->local_variable_count; ++i) + for (i = 0; i < effect->local_variable_count; ++i) { - d3d10_effect_variable_destroy(&This->local_variables[i]); + d3d10_effect_variable_destroy(&effect->local_variables[i]); } - heap_free(This->local_variables); + heap_free(effect->local_variables); } - if (This->local_buffers) + if (effect->local_buffers) { - for (i = 0; i < This->local_buffer_count; ++i) + for (i = 0; i < effect->local_buffer_count; ++i) { - d3d10_effect_local_buffer_destroy(&This->local_buffers[i]); + d3d10_effect_local_buffer_destroy(&effect->local_buffers[i]); } - heap_free(This->local_buffers); + heap_free(effect->local_buffers); } - if (This->anonymous_shaders) + if (effect->anonymous_shaders) { - for (i = 0; i < This->anonymous_shader_count; ++i) + for (i = 0; i < effect->anonymous_shader_count; ++i) { - d3d10_effect_variable_destroy(&This->anonymous_shaders[i].shader); - heap_free(This->anonymous_shaders[i].type.name); + d3d10_effect_variable_destroy(&effect->anonymous_shaders[i].shader); + heap_free(effect->anonymous_shaders[i].type.name); } - heap_free(This->anonymous_shaders); + heap_free(effect->anonymous_shaders); } - heap_free(This->shaders.v); + heap_free(effect->shaders.v); + heap_free(effect->samplers.v); + heap_free(effect->rtvs.v); + heap_free(effect->dsvs.v); + heap_free(effect->blend_states.v); + heap_free(effect->ds_states.v); + heap_free(effect->rs_states.v); - wine_rb_destroy(&This->types, d3d10_effect_type_destroy, NULL); + wine_rb_destroy(&effect->types, d3d10_effect_type_destroy, NULL); - if (This->pool) - IUnknown_Release(&This->pool->ID3D10Effect_iface); - ID3D10Device_Release(This->device); - heap_free(This); + if (effect->pool) + IUnknown_Release(&effect->pool->ID3D10Effect_iface); + ID3D10Device_Release(effect->device); + heap_free(effect); } return refcount;

1 0

Nikolay Sivov : d3d10/effect: Add a structure to keep shader variables references.
by Alexandre Julliard Jan. 20, 2022

Jan. 20, 2022

Module: wine Branch: master Commit: 62b367fb65a86eb78fb868e8e623386e2cfbab67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62b367fb65a86eb78fb868e8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 19 13:29:05 2022 +0300 d3d10/effect: Add a structure to keep shader variables references. 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/d3d10_private.h | 11 ++++++++--- dlls/d3d10/effect.c | 30 +++++++++++++++--------------- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index b35711b55e5..88bfd48bc3d 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -263,6 +263,13 @@ enum d3d10_effect_flags D3D10_EFFECT_IS_POOL = 0x2, }; +struct d3d10_effect_var_array +{ + struct d3d10_effect_variable **v; + unsigned int current; + unsigned int count; +}; + /* ID3D10Effect */ struct d3d10_effect { @@ -287,18 +294,16 @@ struct d3d10_effect DWORD samplerstate_count; DWORD rendertargetview_count; DWORD depthstencilview_count; - DWORD used_shader_count; DWORD anonymous_shader_count; DWORD flags; - DWORD used_shader_current; DWORD anonymous_shader_current; struct wine_rb_tree types; struct d3d10_effect_variable *local_buffers; struct d3d10_effect_variable *local_variables; struct d3d10_effect_anonymous_shader *anonymous_shaders; - struct d3d10_effect_variable **used_shaders; + struct d3d10_effect_var_array shaders; struct d3d10_effect_technique *techniques; }; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 61b48cdeacb..d70be57e8ac 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1235,14 +1235,14 @@ static HRESULT parse_fx10_shader(const char *data, size_t data_size, DWORD offse const char *ptr; HRESULT hr; - if (v->effect->used_shader_current >= v->effect->used_shader_count) + if (v->effect->shaders.current >= v->effect->shaders.count) { - WARN("Invalid shader? Used shader current(%u) >= used shader count(%u)\n", v->effect->used_shader_current, v->effect->used_shader_count); + WARN("Invalid effect? Used shader current(%u) >= used shader count(%u)\n", + v->effect->shaders.current, v->effect->shaders.count); return E_FAIL; } - v->effect->used_shaders[v->effect->used_shader_current] = v; - ++v->effect->used_shader_current; + v->effect->shaders.v[v->effect->shaders.current++] = v; if (offset >= data_size || !require_space(offset, 1, sizeof(dxbc_size), data_size)) { @@ -3552,7 +3552,7 @@ static HRESULT parse_fx10_body(struct d3d10_effect *e, const char *data, DWORD d return E_OUTOFMEMORY; } - if (!(e->used_shaders = heap_calloc(e->used_shader_count, sizeof(*e->used_shaders)))) + if (!(e->shaders.v = heap_calloc(e->shaders.count, sizeof(*e->shaders.v)))) { ERR("Failed to allocate used shaders memory\n"); return E_OUTOFMEMORY; @@ -3698,8 +3698,8 @@ static HRESULT parse_fx10(struct d3d10_effect *e, const char *data, DWORD data_s read_dword(&ptr, &e->depthstencilview_count); TRACE("Depthstencilview count: %u\n", e->depthstencilview_count); - read_dword(&ptr, &e->used_shader_count); - TRACE("Used shader count: %u\n", e->used_shader_count); + read_dword(&ptr, &e->shaders.count); + TRACE("Used shader count: %u\n", e->shaders.count); read_dword(&ptr, &e->anonymous_shader_count); TRACE("Anonymous shader count: %u\n", e->anonymous_shader_count); @@ -3999,7 +3999,7 @@ static ULONG STDMETHODCALLTYPE d3d10_effect_Release(ID3D10Effect *iface) heap_free(This->anonymous_shaders); } - heap_free(This->used_shaders); + heap_free(This->shaders.v); wine_rb_destroy(&This->types, d3d10_effect_type_destroy, NULL); @@ -4312,9 +4312,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_Optimize(ID3D10Effect *iface) if (effect->flags & D3D10_EFFECT_OPTIMIZED) return S_OK; - for (i = 0; i < effect->used_shader_count; ++i) + for (i = 0; i < effect->shaders.count; ++i) { - v = effect->used_shaders[i]; + v = effect->shaders.v[i]; if (v->u.shader.reflection) { @@ -8065,19 +8065,19 @@ static HRESULT d3d10_get_shader_variable(struct d3d10_effect_variable *v, UINT s /* Index is used as an offset from this variable. */ - for (i = 0; i < v->effect->used_shader_count; ++i) + for (i = 0; i < v->effect->shaders.count; ++i) { - if (v == v->effect->used_shaders[i]) break; + if (v == v->effect->shaders.v[i]) break; } - if (i + shader_index >= v->effect->used_shader_count) + if (i + shader_index >= v->effect->shaders.count) { WARN("Invalid shader index %u.\n", shader_index); return E_FAIL; } - *s = &v->effect->used_shaders[i + shader_index]->u.shader; - if (basetype) *basetype = v->effect->used_shaders[i + shader_index]->type->basetype; + *s = &v->effect->shaders.v[i + shader_index]->u.shader; + if (basetype) *basetype = v->effect->shaders.v[i + shader_index]->type->basetype; return S_OK; }

1 0

Nikolay Sivov : mf/samplegrabber: Cancel pending sample timer.
by Alexandre Julliard Jan. 20, 2022

Jan. 20, 2022

Module: wine Branch: master Commit: 8679255eccd57e2a1a785a7efac04e0c84cb9055 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8679255eccd57e2a1a785a7e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 20 13:46:55 2022 +0300 mf/samplegrabber: Cancel pending sample timer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index e0287e1e1db..e7d3be68df3 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -849,11 +849,7 @@ static ULONG WINAPI sample_grabber_sink_Release(IMFMediaSink *iface) if (grabber->clock) IMFPresentationClock_Release(grabber->clock); if (grabber->timer) - { - if (grabber->cancel_key) - IMFTimer_CancelTimer(grabber->timer, grabber->cancel_key); IMFTimer_Release(grabber->timer); - } if (grabber->cancel_key) IUnknown_Release(grabber->cancel_key); if (grabber->stream_event_queue) @@ -973,10 +969,21 @@ static HRESULT WINAPI sample_grabber_sink_GetStreamSinkById(IMFMediaSink *iface, return hr; } +static void sample_grabber_cancel_timer(struct sample_grabber *grabber) +{ + if (grabber->timer && grabber->cancel_key) + { + IMFTimer_CancelTimer(grabber->timer, grabber->cancel_key); + IUnknown_Release(grabber->cancel_key); + grabber->cancel_key = NULL; + } +} + static void sample_grabber_set_presentation_clock(struct sample_grabber *grabber, IMFPresentationClock *clock) { if (grabber->clock) { + sample_grabber_cancel_timer(grabber); IMFPresentationClock_RemoveClockStateSink(grabber->clock, &grabber->IMFClockStateSink_iface); IMFPresentationClock_Release(grabber->clock); if (grabber->timer) @@ -1122,6 +1129,9 @@ static HRESULT sample_grabber_set_state(struct sample_grabber *grabber, enum sin hr = MF_E_INVALID_STATE_TRANSITION; else { + if (state == SINK_STATE_STOPPED) + sample_grabber_cancel_timer(grabber); + if (state == SINK_STATE_RUNNING && grabber->state == SINK_STATE_STOPPED) { /* Every transition to running state sends a bunch requests to build up initial queue. */

1 0

Nikolay Sivov : mfmediaengine/tests: Do not use stack variables for async notification callbacks.
by Alexandre Julliard Jan. 20, 2022

Jan. 20, 2022

Module: wine Branch: master Commit: 9af18c48cfda31a03f7a45623b9f9badbaf97ee6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9af18c48cfda31a03f7a4562… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 20 17:49:14 2022 +0300 mfmediaengine/tests: Do not use stack variables for async notification callbacks. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/tests/mfmediaengine.c | 77 ++++++++++++++++++++++---------- 1 file changed, 54 insertions(+), 23 deletions(-) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 047a81d0d88..1f0a2eda1b3 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -104,7 +104,12 @@ static ULONG WINAPI media_engine_notify_AddRef(IMFMediaEngineNotify *iface) static ULONG WINAPI media_engine_notify_Release(IMFMediaEngineNotify *iface) { struct media_engine_notify *notify = impl_from_IMFMediaEngineNotify(iface); - return InterlockedDecrement(&notify->refcount); + ULONG refcount = InterlockedDecrement(&notify->refcount); + + if (!refcount) + free(notify); + + return refcount; } static HRESULT WINAPI media_engine_notify_EventNotify(IMFMediaEngineNotify *iface, DWORD event, DWORD_PTR param1, DWORD param2) @@ -120,6 +125,18 @@ static IMFMediaEngineNotifyVtbl media_engine_notify_vtbl = media_engine_notify_EventNotify, }; +static struct media_engine_notify *create_callback(void) +{ + struct media_engine_notify *object; + + object = calloc(1, sizeof(*object)); + + object->IMFMediaEngineNotify_iface.lpVtbl = &media_engine_notify_vtbl; + object->refcount = 1; + + return object; +} + static IMFMediaEngine *create_media_engine(IMFMediaEngineNotify *callback) { IMFDXGIDeviceManager *manager; @@ -150,9 +167,8 @@ static IMFMediaEngine *create_media_engine(IMFMediaEngineNotify *callback) static void test_factory(void) { - struct media_engine_notify notify_impl = {{&media_engine_notify_vtbl}, 1}; - IMFMediaEngineNotify *notify = &notify_impl.IMFMediaEngineNotify_iface; IMFMediaEngineClassFactory *factory, *factory2; + struct media_engine_notify *notify; IMFDXGIDeviceManager *manager; IMFMediaEngine *media_engine; IMFAttributes *attributes; @@ -168,6 +184,8 @@ static void test_factory(void) return; } + notify = create_callback(); + /* Aggregation is not supported. */ hr = CoCreateInstance(&CLSID_MFMediaEngineClassFactory, (IUnknown *)factory, CLSCTX_INPROC_SERVER, &IID_IMFMediaEngineClassFactory, (void **)&factory2); @@ -189,7 +207,7 @@ static void test_factory(void) ok(hr == MF_E_ATTRIBUTENOTFOUND, "IMFMediaEngineClassFactory_CreateInstance got %#x.\n", hr); IMFAttributes_DeleteAllItems(attributes); - hr = IMFAttributes_SetUnknown(attributes, &MF_MEDIA_ENGINE_CALLBACK, (IUnknown *)notify); + hr = IMFAttributes_SetUnknown(attributes, &MF_MEDIA_ENGINE_CALLBACK, (IUnknown *)&notify->IMFMediaEngineNotify_iface); ok(hr == S_OK, "IMFAttributes_SetUnknown failed: %#x.\n", hr); hr = IMFAttributes_SetUINT32(attributes, &MF_MEDIA_ENGINE_VIDEO_OUTPUT_FORMAT, DXGI_FORMAT_UNKNOWN); ok(hr == S_OK, "IMFAttributes_SetUINT32 failed: %#x.\n", hr); @@ -203,12 +221,12 @@ static void test_factory(void) IMFAttributes_Release(attributes); IMFDXGIDeviceManager_Release(manager); IMFMediaEngineClassFactory_Release(factory); + IMFMediaEngineNotify_Release(&notify->IMFMediaEngineNotify_iface); } static void test_CreateInstance(void) { - struct media_engine_notify notify_impl = {{&media_engine_notify_vtbl}, 1}; - IMFMediaEngineNotify *notify = &notify_impl.IMFMediaEngineNotify_iface; + struct media_engine_notify *notify; IMFDXGIDeviceManager *manager; IMFMediaEngine *media_engine; IMFAttributes *attributes; @@ -216,6 +234,8 @@ static void test_CreateInstance(void) UINT token; HRESULT hr; + notify = create_callback(); + hr = pMFCreateDXGIDeviceManager(&token, &manager); ok(hr == S_OK, "Failed to create dxgi device manager, hr %#x.\n", hr); @@ -235,7 +255,7 @@ static void test_CreateInstance(void) IMFAttributes_DeleteAllItems(attributes); - hr = IMFAttributes_SetUnknown(attributes, &MF_MEDIA_ENGINE_CALLBACK, (IUnknown *)notify); + hr = IMFAttributes_SetUnknown(attributes, &MF_MEDIA_ENGINE_CALLBACK, (IUnknown *)&notify->IMFMediaEngineNotify_iface); ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); hr = IMFAttributes_SetUINT32(attributes, &MF_MEDIA_ENGINE_VIDEO_OUTPUT_FORMAT, DXGI_FORMAT_UNKNOWN); ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); @@ -253,12 +273,12 @@ static void test_CreateInstance(void) IMFMediaEngine_Release(media_engine); IMFAttributes_Release(attributes); IMFDXGIDeviceManager_Release(manager); + IMFMediaEngineNotify_Release(&notify->IMFMediaEngineNotify_iface); } static void test_Shutdown(void) { - struct media_engine_notify notify_impl = {{&media_engine_notify_vtbl}, 1}; - IMFMediaEngineNotify *callback = &notify_impl.IMFMediaEngineNotify_iface; + struct media_engine_notify *notify; IMFMediaTimeRange *time_range; IMFMediaEngine *media_engine; unsigned int state; @@ -267,7 +287,9 @@ static void test_Shutdown(void) HRESULT hr; BSTR str; - media_engine = create_media_engine(callback); + notify = create_callback(); + + media_engine = create_media_engine(&notify->IMFMediaEngineNotify_iface); hr = IMFMediaEngine_Shutdown(media_engine); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); @@ -407,12 +429,12 @@ todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); IMFMediaEngine_Release(media_engine); + IMFMediaEngineNotify_Release(&notify->IMFMediaEngineNotify_iface); } static void test_Play(void) { - struct media_engine_notify notify_impl = {{&media_engine_notify_vtbl}, 1}; - IMFMediaEngineNotify *callback = &notify_impl.IMFMediaEngineNotify_iface; + struct media_engine_notify *notify; IMFMediaTimeRange *range, *range1; IMFMediaEngine *media_engine; LONGLONG pts; @@ -420,7 +442,9 @@ static void test_Play(void) HRESULT hr; BOOL ret; - media_engine = create_media_engine(callback); + notify = create_callback(); + + media_engine = create_media_engine(&notify->IMFMediaEngineNotify_iface); hr = IMFMediaEngine_GetBuffered(media_engine, &range); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -469,7 +493,7 @@ static void test_Play(void) IMFMediaEngine_Release(media_engine); /* Play -> Pause */ - media_engine = create_media_engine(callback); + media_engine = create_media_engine(&notify->IMFMediaEngineNotify_iface); hr = IMFMediaEngine_Play(media_engine); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -484,17 +508,19 @@ static void test_Play(void) ok(!!ret, "Unexpected state %d.\n", ret); IMFMediaEngine_Release(media_engine); + IMFMediaEngineNotify_Release(&notify->IMFMediaEngineNotify_iface); } static void test_playback_rate(void) { - struct media_engine_notify notify_impl = {{&media_engine_notify_vtbl}, 1}; - IMFMediaEngineNotify *callback = &notify_impl.IMFMediaEngineNotify_iface; + struct media_engine_notify *notify; IMFMediaEngine *media_engine; double rate; HRESULT hr; - media_engine = create_media_engine(callback); + notify = create_callback(); + + media_engine = create_media_engine(&notify->IMFMediaEngineNotify_iface); rate = IMFMediaEngine_GetDefaultPlaybackRate(media_engine); ok(rate == 1.0, "Unexpected default rate.\n"); @@ -512,17 +538,19 @@ static void test_playback_rate(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IMFMediaEngine_Release(media_engine); + IMFMediaEngineNotify_Release(&notify->IMFMediaEngineNotify_iface); } static void test_mute(void) { - struct media_engine_notify notify_impl = {{&media_engine_notify_vtbl}, 1}; - IMFMediaEngineNotify *callback = &notify_impl.IMFMediaEngineNotify_iface; + struct media_engine_notify *notify; IMFMediaEngine *media_engine; HRESULT hr; BOOL ret; - media_engine = create_media_engine(callback); + notify = create_callback(); + + media_engine = create_media_engine(&notify->IMFMediaEngineNotify_iface); ret = IMFMediaEngine_GetMuted(media_engine); ok(!ret, "Unexpected state.\n"); @@ -540,18 +568,20 @@ static void test_mute(void) ok(ret, "Unexpected state.\n"); IMFMediaEngine_Release(media_engine); + IMFMediaEngineNotify_Release(&notify->IMFMediaEngineNotify_iface); } static void test_error(void) { - struct media_engine_notify notify_impl = {{&media_engine_notify_vtbl}, 1}; - IMFMediaEngineNotify *callback = &notify_impl.IMFMediaEngineNotify_iface; + struct media_engine_notify *notify; IMFMediaEngine *media_engine; IMFMediaError *eo, *eo2; unsigned int code; HRESULT hr; - media_engine = create_media_engine(callback); + notify = create_callback(); + + media_engine = create_media_engine(&notify->IMFMediaEngineNotify_iface); eo = (void *)0xdeadbeef; hr = IMFMediaEngine_GetError(media_engine, &eo); @@ -624,6 +654,7 @@ static void test_error(void) ok(hr == E_FAIL, "Unexpected code %#x.\n", hr); IMFMediaError_Release(eo); + IMFMediaEngineNotify_Release(&notify->IMFMediaEngineNotify_iface); } static void test_time_range(void)

1 0

Nikolay Sivov : mfmediaengine: Add IMFGetService stub.
by Alexandre Julliard Jan. 20, 2022

Jan. 20, 2022

Module: wine Branch: master Commit: ef11c41d416bc6a26083a0ac6600c57869338b25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef11c41d416bc6a26083a0ac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 20 17:49:13 2022 +0300 mfmediaengine: Add IMFGetService stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 60 +++++++++++++++++++++++++++++--- dlls/mfmediaengine/tests/mfmediaengine.c | 23 ++++++++++++ 2 files changed, 78 insertions(+), 5 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 5b8d91d9632..b098844a7fa 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -114,6 +114,7 @@ struct rect struct media_engine { IMFMediaEngine IMFMediaEngine_iface; + IMFGetService IMFGetService_iface; IMFAsyncCallback session_events; IMFAsyncCallback load_handler; IMFSampleGrabberSinkCallback grabber_callback; @@ -722,6 +723,11 @@ static inline struct media_engine *impl_from_IMFMediaEngine(IMFMediaEngine *ifac return CONTAINING_RECORD(iface, struct media_engine, IMFMediaEngine_iface); } +static inline struct media_engine *impl_from_IMFGetService(IMFGetService *iface) +{ + return CONTAINING_RECORD(iface, struct media_engine, IMFGetService_iface); +} + static struct media_engine *impl_from_session_events_IMFAsyncCallback(IMFAsyncCallback *iface) { return CONTAINING_RECORD(iface, struct media_engine, session_events); @@ -1254,19 +1260,28 @@ static const IMFAsyncCallbackVtbl media_engine_load_handler_vtbl = static HRESULT WINAPI media_engine_QueryInterface(IMFMediaEngine *iface, REFIID riid, void **obj) { + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); if (IsEqualIID(riid, &IID_IMFMediaEngine) || IsEqualIID(riid, &IID_IUnknown)) { *obj = iface; - IMFMediaEngine_AddRef(iface); - return S_OK; + } + else if (IsEqualIID(riid, &IID_IMFGetService)) + { + *obj = &engine->IMFGetService_iface; + } + else + { + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; } - WARN("Unsupported interface %s.\n", debugstr_guid(riid)); - *obj = NULL; - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown *)*obj); + return S_OK; } static ULONG WINAPI media_engine_AddRef(IMFMediaEngine *iface) @@ -2288,6 +2303,40 @@ static const IMFMediaEngineVtbl media_engine_vtbl = media_engine_OnVideoStreamTick, }; +static HRESULT WINAPI media_engine_gs_QueryInterface(IMFGetService *iface, REFIID riid, void **obj) +{ + struct media_engine *engine = impl_from_IMFGetService(iface); + return IMFMediaEngine_QueryInterface(&engine->IMFMediaEngine_iface, riid, obj); +} + +static ULONG WINAPI media_engine_gs_AddRef(IMFGetService *iface) +{ + struct media_engine *engine = impl_from_IMFGetService(iface); + return IMFMediaEngine_AddRef(&engine->IMFMediaEngine_iface); +} + +static ULONG WINAPI media_engine_gs_Release(IMFGetService *iface) +{ + struct media_engine *engine = impl_from_IMFGetService(iface); + return IMFMediaEngine_Release(&engine->IMFMediaEngine_iface); +} + +static HRESULT WINAPI media_engine_gs_GetService(IMFGetService *iface, REFGUID service, + REFIID riid, void **object) +{ + FIXME("%p, %s, %s, %p stub.\n", iface, debugstr_guid(service), debugstr_guid(riid), object); + + return E_NOTIMPL; +} + +static const IMFGetServiceVtbl media_engine_get_service_vtbl = +{ + media_engine_gs_QueryInterface, + media_engine_gs_AddRef, + media_engine_gs_Release, + media_engine_gs_GetService, +}; + static HRESULT WINAPI media_engine_grabber_callback_QueryInterface(IMFSampleGrabberSinkCallback *iface, REFIID riid, void **obj) { @@ -2442,6 +2491,7 @@ static HRESULT init_media_engine(DWORD flags, IMFAttributes *attributes, struct HRESULT hr; engine->IMFMediaEngine_iface.lpVtbl = &media_engine_vtbl; + engine->IMFGetService_iface.lpVtbl = &media_engine_get_service_vtbl; engine->session_events.lpVtbl = &media_engine_session_events_vtbl; engine->load_handler.lpVtbl = &media_engine_load_handler_vtbl; engine->grabber_callback.lpVtbl = &media_engine_grabber_callback_vtbl; diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 096f6e3f2a5..047a81d0d88 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -46,6 +46,21 @@ static void _expect_ref(IUnknown *obj, ULONG ref, int line) ok_(__FILE__,line)(rc == ref, "Unexpected refcount %d, expected %d.\n", rc, ref); } +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + static void init_functions(void) { HMODULE mod = GetModuleHandleA("mfplat.dll"); @@ -197,6 +212,7 @@ static void test_CreateInstance(void) IMFDXGIDeviceManager *manager; IMFMediaEngine *media_engine; IMFAttributes *attributes; + IUnknown *unk; UINT token; HRESULT hr; @@ -227,6 +243,13 @@ static void test_CreateInstance(void) hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, attributes, &media_engine); ok(hr == S_OK, "Failed to create media engine, hr %#x.\n", hr); + check_interface(media_engine, &IID_IMFMediaEngine, TRUE); + + hr = IMFMediaEngine_QueryInterface(media_engine, &IID_IMFGetService, (void **)&unk); + ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* supported since win10 */, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); + IMFMediaEngine_Release(media_engine); IMFAttributes_Release(attributes); IMFDXGIDeviceManager_Release(manager);

1 0

Nikolay Sivov : d3d10/effect: Fix iteration in GetBackingStore() for blend states.
by Alexandre Julliard Jan. 20, 2022

Jan. 20, 2022

Module: wine Branch: master Commit: 50830170eb40dcef6542602186d4cba1c5353872 URL: https://source.winehq.org/git/wine.git/?a=commit;h=50830170eb40dcef65426021… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 19 13:29:09 2022 +0300 d3d10/effect: Fix iteration in GetBackingStore() for blend states. 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 | 11 +++++------ dlls/d3d10/tests/effect.c | 2 ++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 25d6056750e..a6a1189be20 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -8555,21 +8555,20 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_blend_variable_GetBackingStore(ID3 TRACE("iface %p, index %u, desc %p.\n", iface, index, desc); - if (v->type->element_count) - v = impl_from_ID3D10EffectVariable(iface->lpVtbl->GetElement(iface, index)); - - 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; + *desc = v->u.state.desc.blend; return S_OK; } - static const struct ID3D10EffectBlendVariableVtbl d3d10_effect_blend_variable_vtbl = { /* ID3D10EffectVariable methods */ diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index db4bebc0ce6..418747b5df5 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -4519,6 +4519,8 @@ 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]); + b->lpVtbl->GetBackingStore(b, 1, &blend_desc); + ok(blend_desc.SrcBlend == D3D10_BLEND_SRC_COLOR, "Got unexpected SrcBlend %#x.\n", blend_desc.SrcBlend); v = effect->lpVtbl->GetVariableByName(effect, "ds_state"); d = v->lpVtbl->AsDepthStencil(v);

1 0