January 2022 - Wine-Commits

Henri Verbeet : wined3d: Use wined3d_mask_from_size() in shader_glsl_generate_stream_output_setup().
by Alexandre Julliard Jan. 25, 2022

Jan. 25, 2022

Module: wine Branch: master Commit: 8c7dce6949250eb313d2e797e6127fe5c1c466ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c7dce6949250eb313d2e797… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 25 11:51:44 2022 +0100 wined3d: Use wined3d_mask_from_size() in shader_glsl_generate_stream_output_setup(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b2f9d1e0e41..a49644a8fc5 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7318,7 +7318,7 @@ static void shader_glsl_generate_stream_output_setup(struct wined3d_string_buffe DWORD write_mask; char str_mask[6]; - write_mask = ((1u << e->component_count) - 1) << component_idx; + write_mask = wined3d_mask_from_size(e->component_count) << component_idx; shader_glsl_write_mask_to_str(write_mask, str_mask); shader_addline(buffer, "shader_out.reg%u_%u_%u = outputs[%u]%s;\n", register_idx, component_idx, component_idx + e->component_count - 1,

1 0

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

Jan. 25, 2022

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 Jan. 25, 2022

Jan. 25, 2022

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

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

Jan. 25, 2022

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

Stefan Dösinger : ddraw/tests: Accept broken depth readback of new-ish AMD GPUs.
by Alexandre Julliard Jan. 25, 2022

Jan. 25, 2022

Module: wine Branch: master Commit: 917e8dbf671f607f75ffd5d249280d76d87eb3f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=917e8dbf671f607f75ffd5d2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jan 24 15:20:29 2022 +0300 ddraw/tests: Accept broken depth readback of new-ish AMD GPUs. 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/tests/ddraw2.c | 8 +++++++- dlls/ddraw/tests/ddraw4.c | 8 +++++++- dlls/ddraw/tests/ddraw7.c | 9 +++++++-- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index f80d4fe3ab8..00c8f820edb 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -148,6 +148,11 @@ static BOOL ddraw_is_vendor(IDirectDraw2 *ddraw, DWORD vendor) && identifier.dwVendorId == vendor; } +static BOOL ddraw_is_amd(IDirectDraw2 *ddraw) +{ + return ddraw_is_vendor(ddraw, 0x1002); +} + static BOOL ddraw_is_intel(IDirectDraw2 *ddraw) { return ddraw_is_vendor(ddraw, 0x8086); @@ -13640,7 +13645,8 @@ static void test_depth_readback(void) /* The ddraw2 version of this test behaves similarly to the ddraw7 version on Nvidia GPUs, * except that we only have D16 (broken on geforce 9) and D24X8 (broken on geforce 7) available. * Accept all nvidia GPUs as broken here, but still expect one of the formats to pass. */ - ok(compare_uint(expected_depth, depth, max_diff) || ddraw_is_nvidia(ddraw), + ok(compare_uint(expected_depth, depth, max_diff) || ddraw_is_nvidia(ddraw) + || (ddraw_is_amd(ddraw) && tests[i].z_depth == 24), "Test %u: Got depth 0x%08x (diff %d), expected 0x%08x+/-%u, at %u, %u.\n", i, depth, expected_depth - depth, expected_depth, max_diff, x, y); if (!compare_uint(expected_depth, depth, max_diff)) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 4447c5675ea..a8b68b8a20b 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -149,6 +149,11 @@ static BOOL ddraw_is_vendor(IDirectDraw4 *ddraw, DWORD vendor) && identifier.dwVendorId == vendor; } +static BOOL ddraw_is_amd(IDirectDraw4 *ddraw) +{ + return ddraw_is_vendor(ddraw, 0x1002); +} + static BOOL ddraw_is_intel(IDirectDraw4 *ddraw) { return ddraw_is_vendor(ddraw, 0x8086); @@ -16252,7 +16257,8 @@ static void test_depth_readback(void) * * Some of the tested places pass on some GPUs on Wine by accident. */ todo_wine_if(tests[i].todo && !compare_uint(expected_depth, depth, max_diff)) - ok(compare_uint(expected_depth, depth, max_diff) || ddraw_is_nvidia(ddraw), + ok(compare_uint(expected_depth, depth, max_diff) || ddraw_is_nvidia(ddraw) + || (ddraw_is_amd(ddraw) && !tests[i].s_depth && tests[i].z_mask == 0x00ffffff), "Test %u: Got depth 0x%08x (diff %d), expected 0x%08x+/-%u, at %u, %u.\n", i, depth, expected_depth - depth, expected_depth, max_diff, x, y); if (!compare_uint(expected_depth, depth, max_diff)) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index e5324cfe8bd..f4388296702 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -15716,7 +15716,8 @@ static void test_depth_readback(void) depth = raw_value & tests[i].z_mask; expected_depth = (x * (0.9 / 640.0) + y * (0.1 / 480.0)) * tests[i].z_mask; max_diff = ((0.5f * 0.9f) / 640.0f) * tests[i].z_mask; - /* This test is very reliably on AMD, but fails in a number of interesting ways on Nvidia GPUs: + /* This test is very reliably on older AMD drivers, but fails in a number of interesting + * ways on Nvidia GPUs: * * Geforce 7 GPUs work only with D16. D24 and D24S8 return 0, D24X8 broken data. * @@ -15729,10 +15730,14 @@ static void test_depth_readback(void) * Arx Fatalis is broken on the Geforce 9 in the same way it was broken in Wine (bug 43654). * The !tests[i].s_depth is supposed to rule out D16 on GF9 and D24X8 on GF7. * + * On new-ish AMD GPUs (Radeon Polaris at least) returns weird data for D24 and D24X8. D16 + * and D24S8 work. + * * Some of the tested places pass on some GPUs on Wine by accident. */ todo_wine_if(tests[i].todo && !compare_uint(expected_depth, depth, max_diff)) ok(compare_uint(expected_depth, depth, max_diff) - || (ddraw_is_nvidia(ddraw) && (all_zero || all_one || !tests[i].s_depth)), + || (ddraw_is_nvidia(ddraw) && (all_zero || all_one || !tests[i].s_depth)) + || (ddraw_is_amd(ddraw) && !tests[i].s_depth && tests[i].z_mask == 0x00ffffff), "Test %u: Got depth 0x%08x (diff %d), expected 0x%08x+/-%u, at %u, %u.\n", i, depth, expected_depth - depth, expected_depth, max_diff, x, y); if (!compare_uint(expected_depth, depth, max_diff))

1 0

Ben Shefte : ntdll: Use case insensitive comparison in is_import_dll_system().
by Alexandre Julliard Jan. 25, 2022

Jan. 25, 2022

Module: wine Branch: master Commit: 9d1ac957b4e4e399b49f9b7f443336806482707e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d1ac957b4e4e399b49f9b7f… Author: Ben Shefte <shefben(a)gmail.com> Date: Tue Jan 25 15:20:24 2022 +0300 ntdll: Use case insensitive comparison in is_import_dll_system(). Fixes a regression introduced by commit 250c113169217933b1fffa8024fa958f71b8aee7. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52446 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 362e1c66be5..b50b9e61bbc 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -628,7 +628,7 @@ static BOOL is_import_dll_system( LDR_DATA_TABLE_ENTRY *mod, const IMAGE_IMPORT_ { const char *name = get_rva( mod->DllBase, import->Name ); - return !strcmp( name, "ntdll.dll" ) || !strcmp( name, "kernel32.dll" ); + return !_stricmp( name, "ntdll.dll" ) || !_stricmp( name, "kernel32.dll" ); } /**********************************************************************

1 0

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

Jan. 25, 2022

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

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

Jan. 25, 2022

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

Henri Verbeet : wined3d: Use wined3d_mask_from_size() in set_glsl_shader_program().
by Alexandre Julliard Jan. 25, 2022

Jan. 25, 2022

Module: wine Branch: master Commit: c8c79a9043f1f50b34b4333e108dac7414ce8616 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8c79a9043f1f50b34b4333e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 25 11:51:45 2022 +0100 wined3d: Use wined3d_mask_from_size() in set_glsl_shader_program(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a49644a8fc5..e6381265def 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10506,7 +10506,7 @@ static void set_glsl_shader_program(const struct wined3d_context_gl *context_gl, { unsigned int clip_distance_count = wined3d_popcount(pre_rasterization_shader->reg_maps.clip_distance_mask); entry->shader_controlled_clip_distances = 1; - entry->clip_distance_mask = (1u << clip_distance_count) - 1; + entry->clip_distance_mask = wined3d_mask_from_size(clip_distance_count); } if (needs_legacy_glsl_syntax(gl_info))

1 0

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

Jan. 25, 2022

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