- Wine-Commits - list.winehq.org

Conor McCarthy : vkd3d: Add ID3D12Device7 interface stubs.
by Alexandre Julliard Feb. 1, 2024

Feb. 1, 2024

Module: vkd3d Branch: master Commit: 92e19a7da36a81f895ad03d6671d777b9a3d6cf9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/92e19a7da36a81f895ad03d6671d7… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jan 30 15:46:29 2024 +1000 vkd3d: Add ID3D12Device7 interface stubs. --- libs/vkd3d/device.c | 258 ++++++++++++++++++++++++--------------------- libs/vkd3d/resource.c | 2 +- libs/vkd3d/vkd3d_main.c | 4 +- libs/vkd3d/vkd3d_private.h | 12 +-- 4 files changed, 149 insertions(+), 127 deletions(-)

1 0

Conor McCarthy : vkd3d-shader/spirv: Emit a vector bitcast if necessary in spirv_compiler_emit_load_ssa_reg().
by Alexandre Julliard Feb. 1, 2024

Feb. 1, 2024

Module: vkd3d Branch: master Commit: 95e4222cc65a23d842245a38fb6b0cb46cffcf04 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/95e4222cc65a23d842245a38fb6b0… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Jan 25 13:32:29 2024 +1000 vkd3d-shader/spirv: Emit a vector bitcast if necessary in spirv_compiler_emit_load_ssa_reg(). --- libs/vkd3d-shader/spirv.c | 11 ++++++++++- tests/hlsl/texture-load-typed.shader_test | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 755758ce..d4333e6d 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3884,9 +3884,10 @@ static uint32_t spirv_compiler_emit_load_ssa_reg(struct spirv_compiler *compiler } assert(vkd3d_swizzle_is_scalar(swizzle, reg)); + reg_component_type = vkd3d_component_type_from_data_type(ssa->data_type); + if (reg->dimension == VSIR_DIMENSION_SCALAR) { - reg_component_type = vkd3d_component_type_from_data_type(ssa->data_type); if (component_type != reg_component_type) { type_id = vkd3d_spirv_get_type_id(builder, component_type, 1); @@ -3896,6 +3897,14 @@ static uint32_t spirv_compiler_emit_load_ssa_reg(struct spirv_compiler *compiler return val_id; } + if (component_type != reg_component_type) + { + /* Required for resource loads with sampled type int, because DXIL has no signedness. + * Only 128-bit vector sizes are used. */ + type_id = vkd3d_spirv_get_type_id(builder, component_type, VKD3D_VEC4_SIZE); + val_id = vkd3d_spirv_build_op_bitcast(builder, type_id, val_id); + } + type_id = vkd3d_spirv_get_type_id(builder, component_type, 1); component_idx = vsir_swizzle_get_component(swizzle, 0); return vkd3d_spirv_build_op_composite_extract1(builder, type_id, val_id, component_idx); diff --git a/tests/hlsl/texture-load-typed.shader_test b/tests/hlsl/texture-load-typed.shader_test index 67a13f10..736b4ae1 100644 --- a/tests/hlsl/texture-load-typed.shader_test +++ b/tests/hlsl/texture-load-typed.shader_test @@ -48,7 +48,7 @@ float4 main() : sv_target } [test] -todo(sm>=6) draw quad +draw quad probe all rgba (0.8, -3.0, 4294967295.0, 123.0) % lowercase 'texture2D'

1 0

Conor McCarthy : vkd3d: Add ID3D12Device6 interface stub.
by Alexandre Julliard Feb. 1, 2024

Feb. 1, 2024

Module: vkd3d Branch: master Commit: 76fbbe980a66283d284e4671a79663c71b52837a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/76fbbe980a66283d284e4671a7966… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Jun 7 14:35:36 2023 +1000 vkd3d: Add ID3D12Device6 interface stub. --- libs/vkd3d/device.c | 247 ++++++++++++++++++++++++--------------------- libs/vkd3d/resource.c | 2 +- libs/vkd3d/vkd3d_main.c | 4 +- libs/vkd3d/vkd3d_private.h | 12 +-- 4 files changed, 139 insertions(+), 126 deletions(-)

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement DX intrinsic TextureLoad.
by Alexandre Julliard Feb. 1, 2024

Feb. 1, 2024

Module: vkd3d Branch: master Commit: ebec0aa43480fb183c1c102bcc90f910de557f16 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ebec0aa43480fb183c1c102bcc90f… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Jan 25 13:28:46 2024 +1000 vkd3d-shader/dxil: Implement DX intrinsic TextureLoad. --- libs/vkd3d-shader/dxil.c | 155 ++++++++++++++++++++- libs/vkd3d-shader/spirv.c | 10 -- libs/vkd3d-shader/vkd3d_shader_private.h | 10 ++ tests/hlsl/cbuffer.shader_test | 4 +- tests/hlsl/initializer-objects.shader_test | 4 +- tests/hlsl/load-level.shader_test | 6 +- tests/hlsl/object-references.shader_test | 4 +- .../register-reservations-resources.shader_test | 32 +++-- tests/hlsl/swizzle-constant-prop.shader_test | 6 +- tests/hlsl/texture-load-offset.shader_test | 4 +- tests/hlsl/texture-load.shader_test | 6 +- 11 files changed, 204 insertions(+), 37 deletions(-)

1 0

Vibhav Pant : configure: Correctly derive the target from CC if it's set to an absolute path.
by Alexandre Julliard Feb. 1, 2024

Feb. 1, 2024

Module: wine Branch: master Commit: 36fa4da337b6a2c585ac20e4228c562dfb45af62 URL: https://gitlab.winehq.org/wine/wine/-/commit/36fa4da337b6a2c585ac20e4228c56… Author: Vibhav Pant <vibhavp(a)gmail.com> Date: Thu Feb 1 19:21:44 2024 +0530 configure: Correctly derive the target from CC if it's set to an absolute path. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56279 --- configure | 2 ++ configure.ac | 2 ++ 2 files changed, 4 insertions(+) diff --git a/configure b/configure index ca82387287a..e87495c42d9 100755 --- a/configure +++ b/configure @@ -10657,6 +10657,8 @@ then : while test $# -ge 1 do case "$1" in + */*-gcc) target=`expr "$1" : '.*/$.*$-gcc'` ;; + */*-clang) target=`expr "$1" : '.*/$.*$-clang'` ;; *-gcc) target=`expr "$1" : '$.*$-gcc'` ;; *-clang) target=`expr "$1" : '$.*$-clang'` ;; esac diff --git a/configure.ac b/configure.ac index 4bf9f76848e..ba1be1bf9d3 100644 --- a/configure.ac +++ b/configure.ac @@ -882,6 +882,8 @@ do while test $# -ge 1 do case "$1" in + */*-gcc) target=`expr "$1" : '.*/$.*$-gcc'` ;; + */*-clang) target=`expr "$1" : '.*/$.*$-clang'` ;; *-gcc) target=`expr "$1" : '$.*$-gcc'` ;; *-clang) target=`expr "$1" : '$.*$-clang'` ;; esac

1 0

Louis Lenders : shcore: Add stub for RegisterScaleChangeNotifications.
by Alexandre Julliard Feb. 1, 2024

Feb. 1, 2024

Module: wine Branch: master Commit: c3918f2a82fd67301cf5fe1b35894506a34a2135 URL: https://gitlab.winehq.org/wine/wine/-/commit/c3918f2a82fd67301cf5fe1b358945… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Feb 1 21:15:39 2024 +0100 shcore: Add stub for RegisterScaleChangeNotifications. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56244 --- dlls/shcore/main.c | 12 ++++++++++++ dlls/shcore/shcore.spec | 2 +- include/shellscalingapi.h | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 653694a04dc..a64b6661d23 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -2531,6 +2531,18 @@ HRESULT WINAPI RegisterScaleChangeEvent(HANDLE handle, DWORD_PTR *cookie) return E_NOTIMPL; } +/************************************************************************* + * RegisterScaleChangeNotifications [SHCORE.@] + */ +HRESULT WINAPI RegisterScaleChangeNotifications(DISPLAY_DEVICE_TYPE display_device, HWND hwnd, UINT msg, DWORD *cookie) +{ + FIXME("(%d, %p, %u, %p) stub\n", display_device, hwnd, msg, cookie); + + if (cookie) *cookie = 0; + + return E_NOTIMPL; +} + /************************************************************************* * CreateRandomAccessStreamOverStream [SHCORE.@] */ diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index fc265d8215a..102e3014bce 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -33,7 +33,7 @@ # @ stub RecordFeatureError # @ stub RecordFeatureUsage @ stdcall RegisterScaleChangeEvent(ptr ptr) -@ stub RegisterScaleChangeNotifications +@ stdcall RegisterScaleChangeNotifications(long ptr long ptr) @ stub RevokeScaleChangeNotifications @ stdcall SHAnsiToAnsi(str ptr long) @ stdcall SHAnsiToUnicode(str ptr long) diff --git a/include/shellscalingapi.h b/include/shellscalingapi.h index 4689d83e7d9..147195d2cba 100644 --- a/include/shellscalingapi.h +++ b/include/shellscalingapi.h @@ -46,6 +46,7 @@ HRESULT WINAPI GetDpiForMonitor(HMONITOR,MONITOR_DPI_TYPE,UINT*,UINT*); HRESULT WINAPI GetProcessDpiAwareness(HANDLE,PROCESS_DPI_AWARENESS*); DEVICE_SCALE_FACTOR WINAPI GetScaleFactorForDevice(DISPLAY_DEVICE_TYPE device_type); HRESULT WINAPI GetScaleFactorForMonitor(HMONITOR,DEVICE_SCALE_FACTOR*); +HRESULT WINAPI RegisterScaleChangeNotifications(DISPLAY_DEVICE_TYPE,HWND,UINT,DWORD*); HRESULT WINAPI SetProcessDpiAwareness(PROCESS_DPI_AWARENESS); #endif /* __WINE_SHELLSCALINGAPI_H */

1 0

Nikolay Sivov : d3d10/effect: Clarify constant buffer flags field meaning.
by Alexandre Julliard Feb. 1, 2024

Feb. 1, 2024

Module: wine Branch: master Commit: 68ab4c48493f2a777f011f6d8e391de720c98109 URL: https://gitlab.winehq.org/wine/wine/-/commit/68ab4c48493f2a777f011f6d8e391d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 1 14:21:23 2024 +0100 d3d10/effect: Clarify constant buffer flags field meaning. It makes more sense to have it matching fx_5_0 format, which uses the same flag for TBUFFER case, and also keeps 'single' modifier in there. This modifier is ignored on fx_4_x, so it's only needed to be implemented in the compiler. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 51 ++++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 534eadb2659..26394510945 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -3796,10 +3796,13 @@ static HRESULT create_buffer_object(struct d3d10_effect_variable *v) static HRESULT parse_fx10_buffer(const char *data, size_t data_size, const char **ptr, BOOL local, struct d3d10_effect_variable *l) { + enum buffer_flags + { + IS_TBUFFER = 1, + }; const char *prefix = local ? "Local" : "Shared"; + uint32_t offset, flags; unsigned int i; - uint32_t offset; - D3D10_CBUFFER_TYPE d3d10_cbuffer_type; HRESULT hr; unsigned int stride = 0; @@ -3826,32 +3829,30 @@ static HRESULT parse_fx10_buffer(const char *data, size_t data_size, const char l->data_size = read_u32(ptr); TRACE("%s buffer data size: %#x.\n", prefix, l->data_size); - d3d10_cbuffer_type = read_u32(ptr); - TRACE("%s buffer type: %#x.\n", prefix, d3d10_cbuffer_type); + flags = read_u32(ptr); + TRACE("%s buffer flags: %#x.\n", prefix, flags); - switch(d3d10_cbuffer_type) + if (flags & IS_TBUFFER) { - case D3D10_CT_CBUFFER: - l->type->basetype = D3D10_SVT_CBUFFER; - if (!copy_name("cbuffer", &l->type->name)) - { - ERR("Failed to copy name.\n"); - return E_OUTOFMEMORY; - } - break; - - case D3D10_CT_TBUFFER: - l->type->basetype = D3D10_SVT_TBUFFER; - if (!copy_name("tbuffer", &l->type->name)) - { - ERR("Failed to copy name.\n"); - return E_OUTOFMEMORY; - } - break; + l->type->basetype = D3D10_SVT_TBUFFER; + copy_name("tbuffer", &l->type->name); + } + else + { + l->type->basetype = D3D10_SVT_CBUFFER; + copy_name("cbuffer", &l->type->name); + } + if (!l->type->name) + { + ERR("Failed to copy name.\n"); + return E_OUTOFMEMORY; + } - default: - ERR("Unexpected D3D10_CBUFFER_TYPE %#x!\n", d3d10_cbuffer_type); - return E_FAIL; + flags &= ~IS_TBUFFER; + if (flags) + { + ERR("Unexpected buffer flags %#x.\n", flags); + return E_FAIL; } l->type->member_count = read_u32(ptr);

1 0

Evan Tang : tests/shader-runner: Support testing for integer pixel data.
by Alexandre Julliard Feb. 1, 2024

Feb. 1, 2024

Module: vkd3d Branch: master Commit: 13ac795061ea147a66e0d328ad8261685ccdb7e6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/13ac795061ea147a66e0d328ad826… Author: Evan Tang <etang(a)codeweavers.com> Date: Fri Oct 13 16:27:44 2023 -0500 tests/shader-runner: Support testing for integer pixel data. Modified by Conor McCarthy to use read_uint() and read_uint4(). --- tests/d3d12.c | 5 --- tests/d3d12_test_utils.h | 48 ---------------------------- tests/shader_runner.c | 62 +++++++++++++++++++++++++++++------- tests/utils.h | 82 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 133 insertions(+), 64 deletions(-)

1 0

Conor McCarthy : tests/shader-runner: Add an asuint() test to the 64-bit cast tests.
by Alexandre Julliard Feb. 1, 2024

Feb. 1, 2024

Module: vkd3d Branch: master Commit: 254e812b12574337c21957532d628bc0d24c0b50 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/254e812b12574337c21957532d628… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jan 23 13:47:01 2024 +1000 tests/shader-runner: Add an asuint() test to the 64-bit cast tests. --- tests/hlsl/cast-64-bit.shader_test | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tests/hlsl/cast-64-bit.shader_test b/tests/hlsl/cast-64-bit.shader_test index aa558ec9..efdf9263 100644 --- a/tests/hlsl/cast-64-bit.shader_test +++ b/tests/hlsl/cast-64-bit.shader_test @@ -19,6 +19,23 @@ todo(sm<6) draw quad probe all rgba (-4.5, 8.5, 2.0, 2.0) +[pixel shader todo] +uniform double2 d; + +uint4 main() : sv_target +{ + uint4 result; + asuint(d.x, result.x, result.y); + asuint(d.y, result.z, result.w); + return result; +} + +[test] +uniform 0 double2 -4.5 8.500003814697266 +todo draw quad +probe all rgbaui (0, 0xc0120000, 0x80000000, 0x40210000) + + [require] shader model >= 6.0 int64

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement DX intrinsic SplitDouble.
by Alexandre Julliard Feb. 1, 2024

Feb. 1, 2024

Module: vkd3d Branch: master Commit: e6d52861e9d42e09814827c5401f237dd6de7451 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e6d52861e9d42e09814827c5401f2… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Jan 24 14:03:30 2024 +1000 vkd3d-shader/dxil: Implement DX intrinsic SplitDouble. --- libs/vkd3d-shader/dxil.c | 26 ++++++++++++++++++++++++++ tests/hlsl/cast-64-bit.shader_test | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 0358dbb6..e315eabf 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -367,6 +367,7 @@ enum dx_intrinsic_opcode DX_DERIV_COARSEY = 84, DX_DERIV_FINEX = 85, DX_DERIV_FINEY = 86, + DX_SPLIT_DOUBLE = 102, DX_LEGACY_F32TOF16 = 130, DX_LEGACY_F16TOF32 = 131, DX_RAW_BUFFER_LOAD = 139, @@ -1732,6 +1733,11 @@ static bool sm6_type_is_f16_f32(const struct sm6_type *type) return type->class == TYPE_CLASS_FLOAT && (type->u.width == 16 || type->u.width == 32); } +static bool sm6_type_is_double(const struct sm6_type *type) +{ + return type->class == TYPE_CLASS_FLOAT && type->u.width == 64; +} + static inline bool sm6_type_is_floating_point(const struct sm6_type *type) { return type->class == TYPE_CLASS_FLOAT; @@ -3880,6 +3886,19 @@ static void sm6_parser_emit_dx_sincos(struct sm6_parser *sm6, enum dx_intrinsic_ dst->u.reg = dst_params[index].reg; } +static void sm6_parser_emit_dx_split_double(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, + const struct sm6_value **operands, struct function_emission_state *state) +{ + struct vkd3d_shader_instruction *ins = state->ins; + struct vkd3d_shader_src_param *src_param; + + 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, operands[0]); + + instruction_dst_param_init_ssa_vector(ins, 2, sm6); +} + static void sm6_parser_emit_dx_store_output(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, const struct sm6_value **operands, struct function_emission_state *state) { @@ -3950,9 +3969,11 @@ struct sm6_dx_opcode_info i -> int32 m -> int16/32/64 f -> float + d -> double e -> half/float g -> half/float/double H -> handle + S -> splitdouble v -> void o -> overloaded R -> matches the return type @@ -3993,6 +4014,7 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_ROUND_Z ] = {"g", "R", sm6_parser_emit_dx_unary}, [DX_RSQRT ] = {"g", "R", sm6_parser_emit_dx_unary}, [DX_SIN ] = {"g", "R", sm6_parser_emit_dx_sincos}, + [DX_SPLIT_DOUBLE ] = {"S", "d", sm6_parser_emit_dx_split_double}, [DX_SQRT ] = {"g", "R", sm6_parser_emit_dx_unary}, [DX_STORE_OUTPUT ] = {"v", "ii8o", sm6_parser_emit_dx_store_output}, [DX_TAN ] = {"g", "R", sm6_parser_emit_dx_unary}, @@ -4029,12 +4051,16 @@ static bool sm6_parser_validate_operand_type(struct sm6_parser *sm6, const struc return sm6_type_is_i16_i32_i64(type); case 'f': return sm6_type_is_float(type); + case 'd': + return sm6_type_is_double(type); case 'e': return sm6_type_is_f16_f32(type); case 'g': return sm6_type_is_floating_point(type); case 'H': return (is_return || sm6_value_is_handle(value)) && type == sm6->handle_type; + case 'S': + return sm6_type_is_struct(type) && !strcmp(type->u.struc->name, "dx.types.splitdouble"); case 'v': return !type; case 'o': diff --git a/tests/hlsl/cast-64-bit.shader_test b/tests/hlsl/cast-64-bit.shader_test index efdf9263..1e33d811 100644 --- a/tests/hlsl/cast-64-bit.shader_test +++ b/tests/hlsl/cast-64-bit.shader_test @@ -32,7 +32,7 @@ uint4 main() : sv_target [test] uniform 0 double2 -4.5 8.500003814697266 -todo draw quad +todo(sm<6) draw quad probe all rgbaui (0, 0xc0120000, 0x80000000, 0x40210000)

1 0