- Wine-Commits - list.winehq.org

Jacek Caban : configure: Add arm64ec PE target support.
by Alexandre Julliard Nov. 13, 2023

Nov. 13, 2023

Module: wine Branch: master Commit: 5004e6bce7c178383dba700ea4fdea426423f617 URL: https://gitlab.winehq.org/wine/wine/-/commit/5004e6bce7c178383dba700ea4fdea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Sep 30 17:38:24 2023 +0200 configure: Add arm64ec PE target support. --- aclocal.m4 | 3 +- configure | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-- configure.ac | 9 ++++-- tools/makedep.c | 2 +- 4 files changed, 106 insertions(+), 7 deletions(-)

1 0

Matteo Bruni : opengl32: Skip filter_extensions_index() on GL contexts < 3.0.
by Alexandre Julliard Nov. 13, 2023

Nov. 13, 2023

Module: wine Branch: master Commit: 6153ced0f9d86f1a55020f352b43bdf0b32e7286 URL: https://gitlab.winehq.org/wine/wine/-/commit/6153ced0f9d86f1a55020f352b43bd… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Nov 9 21:30:04 2023 +0100 opengl32: Skip filter_extensions_index() on GL contexts < 3.0. glGetStringi() is not available before 3.0. We can't trust its function pointer being NULL since the GL implementation is allowed to return anything in this case (*cough* macOS's GL on Metal *cough*). This probably regressed when fd92954df8cf12c61e08c7ef7acf172efb7c44ad removed the "if (!disabled[0]) return FALSE;" exit from filter_extensions(), although that simply exposed an existing issue. --- dlls/opengl32/unix_wgl.c | 44 +++++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c index 5da69196548..e03bbc0a9c0 100644 --- a/dlls/opengl32/unix_wgl.c +++ b/dlls/opengl32/unix_wgl.c @@ -198,13 +198,32 @@ static GLubyte *filter_extensions_list( const char *extensions, const char *disa return (GLubyte *)str; } +static const char *parse_gl_version( const char *gl_version, int *major, int *minor ) +{ + const char *ptr = gl_version; + + *major = atoi( ptr ); + if (*major <= 0) + ERR( "Invalid OpenGL major version %d.\n", *major ); + + while (isdigit( *ptr )) ++ptr; + if (*ptr++ != '.') + ERR( "Invalid OpenGL version string %s.\n", debugstr_a(gl_version) ); + + *minor = atoi( ptr ); + + while (isdigit( *ptr )) ++ptr; + return ptr; +} + static GLuint *filter_extensions_index( TEB *teb, const char *disabled ) { const struct opengl_funcs *funcs = teb->glTable; + const char *ext, *version; GLuint *disabled_index; GLint extensions_count; unsigned int i = 0, j; - const char *ext; + int major, minor; if (!funcs->ext.p_glGetStringi) { @@ -213,6 +232,11 @@ static GLuint *filter_extensions_index( TEB *teb, const char *disabled ) if (!funcs->ext.p_glGetStringi) return NULL; } + version = (const char *)funcs->gl.p_glGetString( GL_VERSION ); + parse_gl_version( version, &major, &minor ); + if (major < 3) + return NULL; + funcs->gl.p_glGetIntegerv( GL_NUM_EXTENSIONS, &extensions_count ); disabled_index = malloc( extensions_count * sizeof(*disabled_index) ); if (!disabled_index) return NULL; @@ -413,24 +437,6 @@ static BOOL check_extension_support( TEB *teb, const char *extension, const char return FALSE; } -static const char *parse_gl_version( const char *gl_version, int *major, int *minor ) -{ - const char *ptr = gl_version; - - *major = atoi( ptr ); - if (*major <= 0) - ERR( "Invalid OpenGL major version %d.\n", *major ); - - while (isdigit( *ptr )) ++ptr; - if (*ptr++ != '.') - ERR( "Invalid OpenGL version string %s.\n", debugstr_a(gl_version) ); - - *minor = atoi( ptr ); - - while (isdigit( *ptr )) ++ptr; - return ptr; -} - static void wrap_glGetIntegerv( TEB *teb, GLenum pname, GLint *data ) { const struct opengl_funcs *funcs = teb->glTable;

1 0

Henri Verbeet : vkd3d-shader: Implement scanning combined resource/sampler information.
by Alexandre Julliard Nov. 13, 2023

Nov. 13, 2023

Module: vkd3d Branch: master Commit: 9de793f180a5f890d1e484ffba35bbda946e6db0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9de793f180a5f890d1e484ffba35b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 15 01:26:32 2023 +0200 vkd3d-shader: Implement scanning combined resource/sampler information. --- include/vkd3d_shader.h | 67 ++++++++++++++ libs/vkd3d-shader/vkd3d_shader.map | 1 + libs/vkd3d-shader/vkd3d_shader_main.c | 160 +++++++++++++++++++++++++++++++++- tests/vkd3d_shader_api.c | 127 +++++++++++++++++++++++++++ 4 files changed, 354 insertions(+), 1 deletion(-)

1 0

Nikolay Sivov : vkd3d-shader: Fix some spelling mistakes.
by Alexandre Julliard Nov. 13, 2023

Nov. 13, 2023

Module: vkd3d Branch: master Commit: 3203485a7c346d74b33878f01823bb12cc008f81 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3203485a7c346d74b33878f01823b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 12 02:49:38 2023 +0100 vkd3d-shader: Fix some spelling mistakes. --- libs/vkd3d-shader/dxil.c | 8 ++++---- libs/vkd3d-shader/hlsl.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 2174ba52..e21fdca1 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -1910,7 +1910,7 @@ static struct vkd3d_shader_src_param *instruction_src_params_alloc(struct vkd3d_ { ERR("Failed to allocate src params.\n"); vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_OUT_OF_MEMORY, - "Out of memory allocating instruction src paramaters."); + "Out of memory allocating instruction src parameters."); return NULL; } ins->src = params; @@ -1926,7 +1926,7 @@ static struct vkd3d_shader_dst_param *instruction_dst_params_alloc(struct vkd3d_ { ERR("Failed to allocate dst params.\n"); vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_OUT_OF_MEMORY, - "Out of memory allocating instruction dst paramaters."); + "Out of memory allocating instruction dst parameters."); return NULL; } ins->dst = params; @@ -2138,7 +2138,7 @@ static size_t sm6_parser_get_value_index(struct sm6_parser *sm6, uint64_t idx) WARN("Ignoring upper 32 bits of relative index.\n"); i = (uint32_t)sm6->value_count - (uint32_t)idx; - /* This may underflow to produce a forward reference, but it must not exceeed the final value count. */ + /* This may underflow to produce a forward reference, but it must not exceed the final value count. */ if (i >= sm6->cur_max_value) { WARN("Invalid value index %"PRIx64" at %zu.\n", idx, sm6->value_count); @@ -3561,7 +3561,7 @@ static void sm6_parser_emit_cmp2(struct sm6_parser *sm6, const struct dxil_recor if (!(flags & FP_ALLOW_UNSAFE_ALGEBRA)) ins->flags |= VKD3DSI_PRECISE_X; flags &= ~FP_ALLOW_UNSAFE_ALGEBRA; - /* SPIR-V FPFastMathMode is only available in the Kernel executon model. */ + /* SPIR-V FPFastMathMode is only available in the Kernel execution model. */ silence_warning = !(flags & ~(FP_NO_NAN | FP_NO_INF | FP_NO_SIGNED_ZEROS | FP_ALLOW_RECIPROCAL)); } if (flags && silence_warning) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index f1eaf6c2..615529c1 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -372,7 +372,7 @@ struct hlsl_attribute /* Reservation of a register and/or an offset for objects inside constant buffers, to be used as a * starting point of their allocation. They are available through the register(·) and the * packoffset(·) syntaxes, respectivelly. - * The costant buffer offset is measured register components. */ + * The constant buffer offset is measured register components. */ struct hlsl_reg_reservation { char reg_type;

1 0

Nikolay Sivov : vkd3d: Fix some spelling mistakes.
by Alexandre Julliard Nov. 13, 2023

Nov. 13, 2023

Module: vkd3d Branch: master Commit: e7422fdefb4f8ec89b4ef5f92ae463c26a7b087d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e7422fdefb4f8ec89b4ef5f92ae46… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 12 02:49:49 2023 +0100 vkd3d: Fix some spelling mistakes. --- libs/vkd3d/command.c | 2 +- libs/vkd3d/state.c | 4 ++-- libs/vkd3d/vkd3d_private.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 37484e5e..77d0f275 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2536,7 +2536,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_list_Reset(ID3D12GraphicsCommandL static void STDMETHODCALLTYPE d3d12_command_list_ClearState(ID3D12GraphicsCommandList5 *iface, ID3D12PipelineState *pipeline_state) { - FIXME("iface %p, pipline_state %p stub!\n", iface, pipeline_state); + FIXME("iface %p, pipeline_state %p stub!\n", iface, pipeline_state); } static bool d3d12_command_list_has_depth_stencil_view(struct d3d12_command_list *list) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 2545c0f0..2b83cfd8 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -836,7 +836,7 @@ static unsigned int vk_heap_binding_count_from_descriptor_range(const struct d3d else { /* Prefer an unsupported binding count vs a zero count, because shader compilation will fail - * to match a declaration to a zero binding, resulting in failure of pipline state creation. */ + * to match a declaration to a zero binding, resulting in failure of pipeline state creation. */ return max_count + !max_count; } } @@ -3236,7 +3236,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s graphics->ms_desc.alphaToCoverageEnable = desc->BlendState.AlphaToCoverageEnable; graphics->ms_desc.alphaToOneEnable = VK_FALSE; - /* We defer creating the render pass for pipelines wth DSVFormat equal to + /* We defer creating the render pass for pipelines with DSVFormat equal to * DXGI_FORMAT_UNKNOWN. We take the actual DSV format from the bound DSV. */ if (is_dsv_format_unknown) graphics->render_pass = VK_NULL_HANDLE; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 969ea8c4..148ee6c9 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1099,7 +1099,7 @@ HRESULT d3d12_query_heap_create(struct d3d12_device *device, struct d3d12_query_heap *unsafe_impl_from_ID3D12QueryHeap(ID3D12QueryHeap *iface); /* A Vulkan query has to be issued at least one time before the result is - * available. In D3D12 it is legal to get query reults for not issued queries. + * available. In D3D12 it is legal to get query results for not issued queries. */ static inline bool d3d12_query_heap_is_result_available(const struct d3d12_query_heap *heap, unsigned int query_index)

1 0

Nikolay Sivov : tests: Fix some spelling mistakes.
by Alexandre Julliard Nov. 13, 2023

Nov. 13, 2023

Module: vkd3d Branch: master Commit: 41a72a4eae99003a165c2215afba438a5bfea249 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/41a72a4eae99003a165c2215afba4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 12 02:48:30 2023 +0100 tests: Fix some spelling mistakes. --- tests/d3d12.c | 2 +- tests/driver.c | 2 +- tests/shader_runner.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 8f100a5e..649d86ec 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1058,7 +1058,7 @@ static void test_format_support(void) } unsupported_format_features[] = { - /* A recent version of WARP suppots B8G8R8A8 UAVs even on D3D_FEATURE_LEVEL_11_0. */ + /* A recent version of WARP supports B8G8R8A8 UAVs even on D3D_FEATURE_LEVEL_11_0. */ {{DXGI_FORMAT_B8G8R8A8_TYPELESS, D3D12_FORMAT_SUPPORT1_TYPED_UNORDERED_ACCESS_VIEW, D3D12_FORMAT_SUPPORT2_UAV_TYPED_LOAD | D3D12_FORMAT_SUPPORT2_UAV_TYPED_STORE}, true}, }; diff --git a/tests/driver.c b/tests/driver.c index 553417ad..504f51df 100644 --- a/tests/driver.c +++ b/tests/driver.c @@ -108,7 +108,7 @@ static enum program_result run_program(const char *cmdline, const char *log_file if (!GetExitCodeProcess(info.hProcess, &exit_code)) { - fprintf(stderr, "Cannot retrive the process exit code, last error %ld.\n", GetLastError()); + fprintf(stderr, "Cannot retrieve the process exit code, last error %ld.\n", GetLastError()); ret = PROGRAM_RESULT_FAILURE; goto out; } diff --git a/tests/shader_runner.c b/tests/shader_runner.c index dadfe333..7e595814 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -803,7 +803,7 @@ static HRESULT map_unidentified_hrs(HRESULT hr) { if (hr == 0x80010064) { - trace("Mapping unindentified hr %#x as %#x.\n", hr, E_FAIL); + trace("Mapping unidentified hr %#x as %#x.\n", hr, E_FAIL); return E_FAIL; } return hr;

1 0

Nikolay Sivov : vkd3d-shader/dxil: Fully initialize instruction data in sm6_parser_emit_extractval().
by Alexandre Julliard Nov. 13, 2023

Nov. 13, 2023

Module: vkd3d Branch: master Commit: d190fdf8c5fc84cb130135748eacdd9a3c3167e6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d190fdf8c5fc84cb130135748eacd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 10 21:58:58 2023 +0100 vkd3d-shader/dxil: Fully initialize instruction data in sm6_parser_emit_extractval(). Noticed after test runner started crashing when tracing is enabled. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/dxil.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index e21fdca1..82308ff6 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -3632,7 +3632,7 @@ static void sm6_parser_emit_extractval(struct sm6_parser *sm6, const struct dxil } dst->type = type; - ins->handler_idx = VKD3DSIH_MOV; + vsir_instruction_init(ins, &sm6->p.location, VKD3DSIH_MOV); src_param = instruction_src_params_alloc(ins, 1, sm6); src_param_init_from_value(src_param, src);

1 0

Alex Henrie : user32/tests: Allocate clipboard data with HeapAlloc.
by Alexandre Julliard Nov. 13, 2023

Nov. 13, 2023

Module: wine Branch: master Commit: 88e66d0785dbc80bb49834676ef00a71963d0e4f URL: https://gitlab.winehq.org/wine/wine/-/commit/88e66d0785dbc80bb49834676ef00a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Nov 11 14:40:00 2023 -0700 user32/tests: Allocate clipboard data with HeapAlloc. This partially reverts commit faae2162b89e951a94f74f65986f6a1015366cf3. --- dlls/user32/tests/clipboard.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 819188fa8e3..87df06b6621 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -1531,10 +1531,10 @@ static void test_handles( HWND hwnd ) if (0) /* crashes on vista64 */ { - ptr = malloc( sizeof(void *) ); + ptr = HeapAlloc( GetProcessHeap(), 0, 0 ); h = SetClipboardData( format_id2, ptr ); ok( !h, "got %p\n", h ); - free( ptr ); + HeapFree( GetProcessHeap(), 0, ptr ); } h = SetClipboardData( format_id2, empty_fixed ); @@ -1547,12 +1547,12 @@ static void test_handles( HWND hwnd ) ok( h == hmoveable, "got %p\n", h ); ok( is_moveable( h ), "expected moveable mem %p\n", h ); - ptr = malloc( 37 ); + ptr = HeapAlloc( GetProcessHeap(), 0, 37 ); h = SetClipboardData( 0xdeadfade, ptr ); ok( h == ptr || !h, "got %p\n", h ); if (!h) /* heap blocks are rejected on >= win8 */ { - free( ptr ); + HeapFree( GetProcessHeap(), 0, ptr ); ptr = NULL; }

1 0

Henri Verbeet : vkd3d-shader/ir: Introduce vsir_register_is_descriptor().
by Alexandre Julliard Nov. 13, 2023

Nov. 13, 2023

Module: vkd3d Branch: master Commit: 215a2c4edec192c5fe1a409605da483b3ab9d8c8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/215a2c4edec192c5fe1a409605da4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Nov 11 18:48:12 2023 +0100 vkd3d-shader/ir: Introduce vsir_register_is_descriptor(). --- libs/vkd3d-shader/spirv.c | 17 +---------------- libs/vkd3d-shader/tpf.c | 17 +---------------- libs/vkd3d-shader/vkd3d_shader_private.h | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 32 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index d2621ffa..19f56a3a 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3396,21 +3396,6 @@ static bool spirv_compiler_get_register_info(const struct spirv_compiler *compil return true; } -static bool register_is_descriptor(const struct vkd3d_shader_register *reg) -{ - switch (reg->type) - { - case VKD3DSPR_SAMPLER: - case VKD3DSPR_RESOURCE: - case VKD3DSPR_CONSTBUFFER: - case VKD3DSPR_UAV: - return true; - - default: - return false; - } -} - static bool spirv_compiler_enable_descriptor_indexing(struct spirv_compiler *compiler, enum vkd3d_shader_register_type reg_type, enum vkd3d_shader_resource_type resource_type) { @@ -3536,7 +3521,7 @@ static void spirv_compiler_emit_dereference_register(struct spirv_compiler *comp FIXME("Relative addressing not implemented.\n"); /* Handle arrayed registers, e.g. v[3][0]. */ - if (reg->idx_count > 1 && !register_is_descriptor(reg)) + if (reg->idx_count > 1 && !vsir_register_is_descriptor(reg)) indexes[index_count++] = spirv_compiler_emit_register_addressing(compiler, &reg->idx[0]); } diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index d0d2ea82..60fa3b98 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -1751,21 +1751,6 @@ static bool shader_sm4_read_reg_idx(struct vkd3d_shader_sm4_parser *priv, const return true; } -static bool sm4_register_is_descriptor(enum vkd3d_sm4_register_type register_type) -{ - switch (register_type) - { - case VKD3D_SM4_RT_SAMPLER: - case VKD3D_SM4_RT_RESOURCE: - case VKD3D_SM4_RT_CONSTBUFFER: - case VKD3D_SM5_RT_UAV: - return true; - - default: - return false; - } -} - static bool shader_sm4_read_param(struct vkd3d_shader_sm4_parser *priv, const uint32_t **ptr, const uint32_t *end, enum vkd3d_data_type data_type, struct vkd3d_shader_register *param, enum vkd3d_shader_src_modifier *modifier) { @@ -1943,7 +1928,7 @@ static bool shader_sm4_read_param(struct vkd3d_shader_sm4_parser *priv, const ui break; } } - else if (!shader_is_sm_5_1(priv) && sm4_register_is_descriptor(register_type)) + else if (!shader_is_sm_5_1(priv) && vsir_register_is_descriptor(param)) { /* SM5.1 places a symbol identifier in idx[0] and moves * other values up one slot. Normalize to SM5.1. */ diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index e5d59063..bff49453 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -833,6 +833,21 @@ struct vkd3d_shader_register void vsir_register_init(struct vkd3d_shader_register *reg, enum vkd3d_shader_register_type reg_type, enum vkd3d_data_type data_type, unsigned int idx_count); +static inline bool vsir_register_is_descriptor(const struct vkd3d_shader_register *reg) +{ + switch (reg->type) + { + case VKD3DSPR_SAMPLER: + case VKD3DSPR_RESOURCE: + case VKD3DSPR_CONSTBUFFER: + case VKD3DSPR_UAV: + return true; + + default: + return false; + } +} + struct vkd3d_shader_dst_param { struct vkd3d_shader_register reg;

1 0

Tag wine-8.20 : Alexandre Julliard : Release 8.20
by Alexandre Julliard Nov. 10, 2023

Nov. 10, 2023

Module: wine Branch: refs/tags/wine-8.20 Tag: 8cfb57d5faa68ec1b842ba193c46db774bb40d76 URL: https://gitlab.winehq.org/wine/wine/-/tags/8cfb57d5faa68ec1b842ba193c46db77… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 10 21:54:48 2023 +0100 Release 8.20

1 0