January 2024 - Wine-commits

Conor McCarthy : vkd3d-shader/spirv: Decorate non-float32 non-built-in pixel shader inputs as Flat.
by Alexandre Julliard 02 Jan '24

02 Jan '24

Module: vkd3d Branch: master Commit: 78343dcf87d3a911264c6c9a87a9146c43c859c3 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/78343dcf87d3a911264c6c9a87a91… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Dec 19 13:50:46 2023 +1000 vkd3d-shader/spirv: Decorate non-float32 non-built-in pixel shader inputs as Flat. As per VUID-StandaloneSpirv-Flat-04744. Not strictly a regression, but revealed by 66cb2815f because it declares unused inputs. --- libs/vkd3d-shader/spirv.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index a6ececab..7bc9bc47 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4298,14 +4298,18 @@ static void spirv_compiler_decorate_builtin(struct spirv_compiler *compiler, } static void spirv_compiler_emit_interpolation_decorations(struct spirv_compiler *compiler, - uint32_t id, enum vkd3d_shader_interpolation_mode mode) + enum vkd3d_shader_component_type component_type, uint32_t id, enum vkd3d_shader_interpolation_mode mode) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; switch (mode) { case VKD3DSIM_NONE: - break; + /* VUID-StandaloneSpirv-Flat-04744: integer or double types must be + * decorated 'Flat' for fragment shaders. */ + if (compiler->shader_type != VKD3D_SHADER_TYPE_PIXEL || component_type == VKD3D_SHADER_COMPONENT_FLOAT) + break; + /* fall through */ case VKD3DSIM_CONSTANT: vkd3d_spirv_build_op_decorate(builder, id, SpvDecorationFlat, NULL, 0); break; @@ -4901,7 +4905,8 @@ static uint32_t spirv_compiler_emit_input(struct spirv_compiler *compiler, if (component_idx) vkd3d_spirv_build_op_decorate1(builder, input_id, SpvDecorationComponent, component_idx); - spirv_compiler_emit_interpolation_decorations(compiler, input_id, signature_element->interpolation_mode); + spirv_compiler_emit_interpolation_decorations(compiler, component_type, input_id, + signature_element->interpolation_mode); } var_id = input_id;

1 0

Alexandre Julliard : Update copyright info for 2024.
by Alexandre Julliard 02 Jan '24

02 Jan '24

Module: wine Branch: master Commit: 06bfde3bff8bd8b7486638009a31dea7327732d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/06bfde3bff8bd8b7486638009a31de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 1 20:15:23 2024 +0100 Update copyright info for 2024. --- LICENSE | 2 +- dlls/opengl32/version.rc | 2 +- include/wine/wine_common_ver.rc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/LICENSE b/LICENSE index f8aa2b9658d..11d14d50309 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 1993-2023 the Wine project authors (see the file AUTHORS +Copyright (c) 1993-2024 the Wine project authors (see the file AUTHORS for a complete list) Wine is free software; you can redistribute it and/or modify it under diff --git a/dlls/opengl32/version.rc b/dlls/opengl32/version.rc index 63d526ffe00..b66cc57e7b5 100644 --- a/dlls/opengl32/version.rc +++ b/dlls/opengl32/version.rc @@ -20,7 +20,7 @@ #define WINE_FILENAME_STR "opengl32.dll" #define WINE_FILEVERSION 5,1,2600,2082 #define WINE_FILEVERSION_STR "5.1.2600.2082" -#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2023 the Wine project. Not Microsoft" /* CATIA needs 'Microsoft' in both CompanyName _and_ LegalCopyright */ +#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2024 the Wine project. Not Microsoft" /* CATIA needs 'Microsoft' in both CompanyName _and_ LegalCopyright */ #define WINE_PRODUCTVERSION 5,1,2600,2082 #define WINE_PRODUCTVERSION_STR "5.1" diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc index d79062416ed..bc6cc7a3a32 100644 --- a/include/wine/wine_common_ver.rc +++ b/include/wine/wine_common_ver.rc @@ -80,7 +80,7 @@ never complain. #endif #ifndef WINE_LEGALCOPYRIGHT -#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2023 the Wine project authors (see the file AUTHORS for a complete list)" +#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2024 the Wine project authors (see the file AUTHORS for a complete list)" #endif #ifndef WINE_PRODUCTVERSION

1 0

Alexandre Julliard : server: Remove WINESERVER documentation from the man page.
by Alexandre Julliard 02 Jan '24

02 Jan '24

Module: wine Branch: master Commit: 1d81a5cb4c3c9b804cc6fa12155c6019c179a4d6 URL: https://gitlab.winehq.org/wine/wine/-/commit/1d81a5cb4c3c9b804cc6fa12155c60… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 2 13:09:20 2024 +0100 server: Remove WINESERVER documentation from the man page. That variable is not used by the server. --- server/wineserver.de.UTF-8.man.in | 10 ---------- server/wineserver.fr.UTF-8.man.in | 9 --------- server/wineserver.man.in | 9 --------- 3 files changed, 28 deletions(-) diff --git a/server/wineserver.de.UTF-8.man.in b/server/wineserver.de.UTF-8.man.in index df10c7aff8c..c798edba935 100644 --- a/server/wineserver.de.UTF-8.man.in +++ b/server/wineserver.de.UTF-8.man.in @@ -70,16 +70,6 @@ Durch Setzen von unterschiedlichen Pfaden als .I WINEPREFIX für verschiedene Wine-Prozesse ist es möglich, eine beliebige Zahl komplett unabhängiger Sitzungen von Wine zu betreiben. -.TP -.I WINESERVER -Gibt den Pfad und Namen der -.B wineserver --Binärdatei an, die automatisch von \fBwine\fR gestartet wird. Ist diese -Variable nicht gesetzt, wird \fBwine\fR versuchen, -.IR @bindir@/wineserver -zu laden. Existiert dieser Pfad nicht, wird nach einer Datei namens -\fIwineserver\fR an den in der Variable PATH spezifizierten und anderen -wahrscheinlichen Orten gesucht. .SH DATEIEN .TP .B ~/.wine diff --git a/server/wineserver.fr.UTF-8.man.in b/server/wineserver.fr.UTF-8.man.in index a78fe844379..d47bf2fccae 100644 --- a/server/wineserver.fr.UTF-8.man.in +++ b/server/wineserver.fr.UTF-8.man.in @@ -72,15 +72,6 @@ En donnant à .B WINEPREFIX une valeur spécifique pour différents processus Wine, il est possible d'exécuter plusieurs sessions de Wine totalement indépendantes. -.TP -.B WINESERVER -Spécifie le chemin et le nom de l'exécutable -.B wineserver -qui sera lancé automatiquement par \fBwine\fR. -Si cette variable n'est pas définie, Wine essaiera de charger -.I @bindir@/wineserver -ou, à défaut, un fichier nommé -\fIwineserver\fR dans le chemin système ou quelques autres emplacements potentiels. .SH FICHIERS .TP .B ~/.wine diff --git a/server/wineserver.man.in b/server/wineserver.man.in index b10907b51bf..5b9bf97e0f4 100644 --- a/server/wineserver.man.in +++ b/server/wineserver.man.in @@ -72,15 +72,6 @@ By setting .B WINEPREFIX to different values for different Wine processes, it is possible to run a number of truly independent Wine sessions. -.TP -.B WINESERVER -Specifies the path and name of the -.B wineserver -binary that will be launched automatically by \fBwine\fR. If not set, -\fBwine\fR will try to load -.IR @bindir@/wineserver , -and if this doesn't exist it will then look for a file named -\fIwineserver\fR in the path and in a few other likely locations. .SH FILES .TP .B ~/.wine

1 0

Alexandre Julliard : loader: Remove absolute paths references from the man page.
by Alexandre Julliard 02 Jan '24

02 Jan '24

Module: wine Branch: master Commit: 8d628b125441f039d4aead2eaaff24d71cbb64f3 URL: https://gitlab.winehq.org/wine/wine/-/commit/8d628b125441f039d4aead2eaaff24… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 2 13:34:12 2024 +0100 loader: Remove absolute paths references from the man page. All paths are relative to the installation directory by default. --- loader/wine.de.UTF-8.man.in | 46 ++++++++++++++++------------------------ loader/wine.fr.UTF-8.man.in | 29 ++++++++++---------------- loader/wine.man.in | 26 ++++++++--------------- loader/wine.pl.UTF-8.man.in | 51 +++++++++++++++++++-------------------------- 4 files changed, 59 insertions(+), 93 deletions(-)

1 0

Conor McCarthy : vkd3d: Pass int64 capability info to vkd3d-shader.
by Alexandre Julliard 02 Jan '24

02 Jan '24

Module: vkd3d Branch: master Commit: cc43ef3bca0f79070688979d011b6d81629a5628 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/cc43ef3bca0f79070688979d011b6… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Dec 6 00:24:15 2023 +1000 vkd3d: Pass int64 capability info to vkd3d-shader. --- libs/vkd3d/state.c | 11 +++++++++++ tests/hlsl/bitwise.shader_test | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 626d6d62..1457ddf9 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2129,6 +2129,16 @@ static inline unsigned int typed_uav_compile_option(const struct d3d12_device *d : VKD3D_SHADER_COMPILE_OPTION_TYPED_UAV_READ_FORMAT_R32; } +static unsigned int feature_flags_compile_option(const struct d3d12_device *device) +{ + unsigned int flags = 0; + + if (device->feature_options1.Int64ShaderOps) + flags |= VKD3D_SHADER_COMPILE_OPTION_FEATURE_INT64; + + return flags; +} + static HRESULT create_shader_stage(struct d3d12_device *device, struct VkPipelineShaderStageCreateInfo *stage_desc, enum VkShaderStageFlagBits stage, const D3D12_SHADER_BYTECODE *code, const struct vkd3d_shader_interface_info *shader_interface) @@ -2145,6 +2155,7 @@ static HRESULT create_shader_stage(struct d3d12_device *device, {VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_10}, {VKD3D_SHADER_COMPILE_OPTION_TYPED_UAV, typed_uav_compile_option(device)}, {VKD3D_SHADER_COMPILE_OPTION_WRITE_TESS_GEOM_POINT_SIZE, 0}, + {VKD3D_SHADER_COMPILE_OPTION_FEATURE, feature_flags_compile_option(device)}, }; stage_desc->sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO; diff --git a/tests/hlsl/bitwise.shader_test b/tests/hlsl/bitwise.shader_test index 6b4515e2..7b5b4f6b 100644 --- a/tests/hlsl/bitwise.shader_test +++ b/tests/hlsl/bitwise.shader_test @@ -243,5 +243,5 @@ float4 main() : sv_target [test] uniform 0 uint64_t2 0x300000000 0x500000000 -todo draw quad -probe all rgba (25769803776.0, 4294967296.0, 30064771072.0, 1.844674404e19) 1 +draw quad +todo probe all rgba (25769803776.0, 4294967296.0, 30064771072.0, 1.844674404e19) 1

1 0

Conor McCarthy : vkd3d-shader/spirv: Use data_type_is_integer() in spirv_compiler_emit_neg().
by Alexandre Julliard 02 Jan '24

02 Jan '24

Module: vkd3d Branch: master Commit: 511c66d595380b81f0a91b5bb6ee0e4b7d7c4747 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/511c66d595380b81f0a91b5bb6ee0… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Nov 21 16:29:16 2023 +1000 vkd3d-shader/spirv: Use data_type_is_integer() in spirv_compiler_emit_neg(). --- libs/vkd3d-shader/spirv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 45f46a91..d34346b0 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4000,7 +4000,7 @@ static uint32_t spirv_compiler_emit_neg(struct spirv_compiler *compiler, type_id = spirv_compiler_get_type_id_for_reg(compiler, reg, write_mask); if (reg->data_type == VKD3D_DATA_FLOAT || reg->data_type == VKD3D_DATA_DOUBLE) return vkd3d_spirv_build_op_fnegate(builder, type_id, val_id); - else if (reg->data_type == VKD3D_DATA_INT || reg->data_type == VKD3D_DATA_UINT) + else if (data_type_is_integer(reg->data_type)) return vkd3d_spirv_build_op_snegate(builder, type_id, val_id); FIXME("Unhandled data type %#x.\n", reg->data_type);

1 0

Conor McCarthy : vkd3d-shader/spirv: Introduce a data_type_is_64_bit() helper function.
by Alexandre Julliard 02 Jan '24

02 Jan '24

Module: vkd3d Branch: master Commit: fe44873979baeb2d2d3b7648c517dcff55588275 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fe44873979baeb2d2d3b7648c517d… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Nov 21 16:32:35 2023 +1000 vkd3d-shader/spirv: Introduce a data_type_is_64_bit() helper function. --- libs/vkd3d-shader/spirv.c | 4 ++-- libs/vkd3d-shader/vkd3d_shader_private.h | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index d34346b0..585fc862 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3932,7 +3932,7 @@ static uint32_t spirv_compiler_emit_load_reg(struct spirv_compiler *compiler, assert(reg_info.component_type != VKD3D_SHADER_COMPONENT_DOUBLE); spirv_compiler_emit_dereference_register(compiler, reg, &reg_info); - write_mask32 = (reg->data_type == VKD3D_DATA_DOUBLE) ? vsir_write_mask_32_from_64(write_mask) : write_mask; + write_mask32 = data_type_is_64_bit(reg->data_type) ? vsir_write_mask_32_from_64(write_mask) : write_mask; /* Intermediate value (no storage class). */ if (reg_info.storage_class == SpvStorageClassMax) @@ -4148,7 +4148,7 @@ static void spirv_compiler_emit_store_reg(struct spirv_compiler *compiler, component_type = vkd3d_component_type_from_data_type(reg->data_type); if (component_type != reg_info.component_type) { - if (reg->data_type == VKD3D_DATA_DOUBLE) + if (data_type_is_64_bit(reg->data_type)) src_write_mask = vsir_write_mask_32_from_64(write_mask); type_id = vkd3d_spirv_get_type_id(builder, reg_info.component_type, vsir_write_mask_component_count(src_write_mask)); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index f1cc9ad7..a49b21d5 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -620,6 +620,11 @@ static inline bool data_type_is_bool(enum vkd3d_data_type data_type) return data_type == VKD3D_DATA_BOOL; } +static inline bool data_type_is_64_bit(enum vkd3d_data_type data_type) +{ + return data_type == VKD3D_DATA_DOUBLE; +} + enum vsir_dimension { VSIR_DIMENSION_NONE,

1 0

Conor McCarthy : vkd3d-shader/spirv: Introduce a UINT64 component type.
by Alexandre Julliard 02 Jan '24

02 Jan '24

Module: vkd3d Branch: master Commit: 13459a55f148b88a33e726d2bbf250bb989a219d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/13459a55f148b88a33e726d2bbf25… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Nov 21 16:43:36 2023 +1000 vkd3d-shader/spirv: Introduce a UINT64 component type. --- include/vkd3d_shader.h | 2 ++ libs/vkd3d-shader/spirv.c | 6 +++++- libs/vkd3d-shader/vkd3d_shader_private.h | 4 +++- tests/hlsl/bitwise.shader_test | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index a6bf8964..b1a1fff6 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -1569,6 +1569,8 @@ enum vkd3d_shader_component_type VKD3D_SHADER_COMPONENT_BOOL = 0x4, /** 64-bit IEEE floating-point. */ VKD3D_SHADER_COMPONENT_DOUBLE = 0x5, + /** 64-bit unsigned integer. \since 1.11 */ + VKD3D_SHADER_COMPONENT_UINT64 = 0x6, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPONENT_TYPE), }; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 585fc862..b5316b7d 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1797,6 +1797,8 @@ static uint32_t vkd3d_spirv_get_type_id(struct vkd3d_spirv_builder *builder, break; case VKD3D_SHADER_COMPONENT_DOUBLE: return vkd3d_spirv_get_op_type_float(builder, 64); + case VKD3D_SHADER_COMPONENT_UINT64: + return vkd3d_spirv_get_op_type_int(builder, 64, 0); default: FIXME("Unhandled component type %#x.\n", component_type); return 0; @@ -1830,6 +1832,8 @@ static uint32_t vkd3d_spirv_get_type_id_for_data_type(struct vkd3d_spirv_builder break; case VKD3D_DATA_DOUBLE: return vkd3d_spirv_get_op_type_float(builder, 64); + case VKD3D_DATA_UINT64: + return vkd3d_spirv_get_op_type_int(builder, 64, 0); case VKD3D_DATA_BOOL: return vkd3d_spirv_get_op_type_bool(builder); default: @@ -2988,7 +2992,7 @@ static uint32_t spirv_compiler_get_constant64(struct spirv_compiler *compiler, assert(0 < component_count && component_count <= VKD3D_DVEC2_SIZE); type_id = vkd3d_spirv_get_type_id(builder, component_type, component_count); - if (component_type != VKD3D_SHADER_COMPONENT_DOUBLE) + if (component_type != VKD3D_SHADER_COMPONENT_DOUBLE && component_type != VKD3D_SHADER_COMPONENT_UINT64) { FIXME("Unhandled component_type %#x.\n", component_type); return vkd3d_spirv_get_op_undef(builder, type_id); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index a49b21d5..bd6aa086 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -622,7 +622,7 @@ static inline bool data_type_is_bool(enum vkd3d_data_type data_type) static inline bool data_type_is_64_bit(enum vkd3d_data_type data_type) { - return data_type == VKD3D_DATA_DOUBLE; + return data_type == VKD3D_DATA_DOUBLE || data_type == VKD3D_DATA_UINT64; } enum vsir_dimension @@ -1460,6 +1460,8 @@ static inline enum vkd3d_shader_component_type vkd3d_component_type_from_data_ty return VKD3D_SHADER_COMPONENT_INT; case VKD3D_DATA_DOUBLE: return VKD3D_SHADER_COMPONENT_DOUBLE; + case VKD3D_DATA_UINT64: + return VKD3D_SHADER_COMPONENT_UINT64; case VKD3D_DATA_BOOL: return VKD3D_SHADER_COMPONENT_BOOL; default: diff --git a/tests/hlsl/bitwise.shader_test b/tests/hlsl/bitwise.shader_test index 7b5b4f6b..7fc8f744 100644 --- a/tests/hlsl/bitwise.shader_test +++ b/tests/hlsl/bitwise.shader_test @@ -244,4 +244,4 @@ float4 main() : sv_target [test] uniform 0 uint64_t2 0x300000000 0x500000000 draw quad -todo probe all rgba (25769803776.0, 4294967296.0, 30064771072.0, 1.844674404e19) 1 +probe all rgba (25769803776.0, 4294967296.0, 30064771072.0, 1.844674404e19) 1

1 0

Conor McCarthy : vkd3d-shader/spirv: Support 64-bit sources in spirv_compiler_emit_int_div().
by Alexandre Julliard 02 Jan '24

02 Jan '24

Module: vkd3d Branch: master Commit: 99924d913ba4c98bf0206b54d9de17568090c069 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/99924d913ba4c98bf0206b54d9de1… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Nov 22 00:27:30 2023 +1000 vkd3d-shader/spirv: Support 64-bit sources in spirv_compiler_emit_int_div(). --- libs/vkd3d-shader/spirv.c | 45 ++++++++++++++++----------- tests/hlsl/arithmetic-int-uniform.shader_test | 8 ++--- 2 files changed, 30 insertions(+), 23 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index b5316b7d..cc2a2b35 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3052,6 +3052,13 @@ static uint32_t spirv_compiler_get_constant_double_vector(struct spirv_compiler component_count, (const uint64_t *)values); } +static uint32_t spirv_compiler_get_constant_uint64_vector(struct spirv_compiler *compiler, + uint64_t value, unsigned int component_count) +{ + const uint64_t values[] = {value, value}; + return spirv_compiler_get_constant64(compiler, VKD3D_SHADER_COMPONENT_UINT64, component_count, values); +} + static uint32_t spirv_compiler_get_type_id_for_reg(struct spirv_compiler *compiler, const struct vkd3d_shader_register *reg, uint32_t write_mask) { @@ -4326,7 +4333,8 @@ static void spirv_compiler_emit_interpolation_decorations(struct spirv_compiler } static uint32_t spirv_compiler_emit_int_to_bool(struct spirv_compiler *compiler, - enum vkd3d_shader_conditional_op condition, unsigned int component_count, uint32_t val_id) + enum vkd3d_shader_conditional_op condition, enum vkd3d_data_type data_type, + unsigned int component_count, uint32_t val_id) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t type_id; @@ -4337,7 +4345,9 @@ static uint32_t spirv_compiler_emit_int_to_bool(struct spirv_compiler *compiler, type_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_BOOL, component_count); op = condition & VKD3D_SHADER_CONDITIONAL_OP_Z ? SpvOpIEqual : SpvOpINotEqual; return vkd3d_spirv_build_op_tr2(builder, &builder->function_stream, op, type_id, val_id, - spirv_compiler_get_constant_uint_vector(compiler, 0, component_count)); + data_type == VKD3D_DATA_UINT64 + ? spirv_compiler_get_constant_uint64_vector(compiler, 0, component_count) + : spirv_compiler_get_constant_uint_vector(compiler, 0, component_count)); } static uint32_t spirv_compiler_emit_bool_to_int(struct spirv_compiler *compiler, @@ -6984,7 +6994,7 @@ static void spirv_compiler_emit_movc(struct spirv_compiler *compiler, if (src[0].reg.data_type != VKD3D_DATA_BOOL) condition_id = spirv_compiler_emit_int_to_bool(compiler, - VKD3D_SHADER_CONDITIONAL_OP_NZ, component_count, condition_id); + VKD3D_SHADER_CONDITIONAL_OP_NZ, src[0].reg.data_type, component_count, condition_id); val_id = vkd3d_spirv_build_op_select(builder, type_id, condition_id, src1_id, src2_id); spirv_compiler_emit_store_dst(compiler, dst, val_id); @@ -7009,7 +7019,7 @@ static void spirv_compiler_emit_swapc(struct spirv_compiler *compiler, type_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_FLOAT, component_count); condition_id = spirv_compiler_emit_int_to_bool(compiler, - VKD3D_SHADER_CONDITIONAL_OP_NZ, component_count, condition_id); + VKD3D_SHADER_CONDITIONAL_OP_NZ, src[0].reg.data_type, component_count, condition_id); val_id = vkd3d_spirv_build_op_select(builder, type_id, condition_id, src2_id, src1_id); spirv_compiler_emit_store_dst(compiler, &dst[0], val_id); @@ -7171,13 +7181,6 @@ static void spirv_compiler_emit_int_div(struct spirv_compiler *compiler, div_op = instruction->handler_idx == VKD3DSIH_IDIV ? SpvOpSDiv : SpvOpUDiv; mod_op = instruction->handler_idx == VKD3DSIH_IDIV ? SpvOpSRem : SpvOpUMod; - if (dst[0].reg.data_type == VKD3D_DATA_UINT64 || dst[1].reg.data_type == VKD3D_DATA_UINT64) - { - FIXME("Unsupported 64-bit result.\n"); - spirv_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_UNSUPPORTED_FEATURE, - "Bool cast to 64-bit integer is not supported."); - } - if (dst[0].reg.type != VKD3DSPR_NULL) { component_count = vsir_write_mask_component_count(dst[0].write_mask); @@ -7187,9 +7190,11 @@ static void spirv_compiler_emit_int_div(struct spirv_compiler *compiler, src1_id = spirv_compiler_emit_load_src(compiler, &src[1], dst[0].write_mask); condition_id = spirv_compiler_emit_int_to_bool(compiler, - VKD3D_SHADER_CONDITIONAL_OP_NZ, component_count, src1_id); - uint_max_id = spirv_compiler_get_constant_uint_vector(compiler, - 0xffffffff, component_count); + VKD3D_SHADER_CONDITIONAL_OP_NZ, src[1].reg.data_type, component_count, src1_id); + if (dst[0].reg.data_type == VKD3D_DATA_UINT64) + uint_max_id = spirv_compiler_get_constant_uint64_vector(compiler, UINT64_MAX, component_count); + else + uint_max_id = spirv_compiler_get_constant_uint_vector(compiler, 0xffffffff, component_count); val_id = vkd3d_spirv_build_op_tr2(builder, &builder->function_stream, div_op, type_id, src0_id, src1_id); /* The SPIR-V spec says: "The resulting value is undefined if Operand 2 is 0." */ @@ -7209,9 +7214,11 @@ static void spirv_compiler_emit_int_div(struct spirv_compiler *compiler, src1_id = spirv_compiler_emit_load_src(compiler, &src[1], dst[1].write_mask); condition_id = spirv_compiler_emit_int_to_bool(compiler, - VKD3D_SHADER_CONDITIONAL_OP_NZ, component_count, src1_id); - uint_max_id = spirv_compiler_get_constant_uint_vector(compiler, - 0xffffffff, component_count); + VKD3D_SHADER_CONDITIONAL_OP_NZ, src[1].reg.data_type, component_count, src1_id); + if (dst[1].reg.data_type == VKD3D_DATA_UINT64) + uint_max_id = spirv_compiler_get_constant_uint64_vector(compiler, UINT64_MAX, component_count); + else + uint_max_id = spirv_compiler_get_constant_uint_vector(compiler, 0xffffffff, component_count); } val_id = vkd3d_spirv_build_op_tr2(builder, &builder->function_stream, mod_op, type_id, src0_id, src1_id); @@ -7502,7 +7509,7 @@ static uint32_t spirv_compiler_emit_conditional_branch(struct spirv_compiler *co uint32_t condition_id, merge_block_id; condition_id = spirv_compiler_emit_load_src(compiler, src, VKD3DSP_WRITEMASK_0); - condition_id = spirv_compiler_emit_int_to_bool(compiler, instruction->flags, 1, condition_id); + condition_id = spirv_compiler_emit_int_to_bool(compiler, instruction->flags, src->reg.data_type, 1, condition_id); merge_block_id = vkd3d_spirv_alloc_id(builder); @@ -7635,7 +7642,7 @@ static int spirv_compiler_emit_control_flow_instruction(struct spirv_compiler *c return VKD3D_ERROR_OUT_OF_MEMORY; val_id = spirv_compiler_emit_load_src(compiler, src, VKD3DSP_WRITEMASK_0); - condition_id = spirv_compiler_emit_int_to_bool(compiler, instruction->flags, 1, val_id); + condition_id = spirv_compiler_emit_int_to_bool(compiler, instruction->flags, src->reg.data_type, 1, val_id); true_label = vkd3d_spirv_alloc_id(builder); merge_block_id = vkd3d_spirv_alloc_id(builder); diff --git a/tests/hlsl/arithmetic-int-uniform.shader_test b/tests/hlsl/arithmetic-int-uniform.shader_test index c1b0e8ab..bb83eb76 100644 --- a/tests/hlsl/arithmetic-int-uniform.shader_test +++ b/tests/hlsl/arithmetic-int-uniform.shader_test @@ -136,7 +136,7 @@ float4 main() : SV_TARGET [test] uniform 0 int64_t2 5000000000 16000000000 -todo draw quad +draw quad probe all rgba (21.0e9, -11.0e9, 5.0e18, 0.0) 1 [pixel shader] @@ -151,7 +151,7 @@ float4 main() : SV_TARGET [test] uniform 0 int64_t2 5000000000 16000000000 -todo draw quad +draw quad probe all rgba (5.0e9, 5.0e9, -5.0e9, 3.0) [pixel shader] @@ -166,7 +166,7 @@ float4 main() : SV_TARGET [test] uniform 0 int64_t2 42000000000 5000000000 -todo draw quad +draw quad probe all rgba (8.0, -8.0, -8.0, 8.0) [pixel shader] @@ -181,7 +181,7 @@ float4 main() : SV_TARGET [test] uniform 0 int64_t2 42000000000 5000000000 -todo draw quad +draw quad probe all rgba (2.0e9, -2.0e9, 2.0e9, -2.0e9) [pixel shader]

1 0

Conor McCarthy : vkd3d-shader/spirv: Support UINT64 source in spirv_compiler_emit_bool_cast().
by Alexandre Julliard 02 Jan '24

02 Jan '24

Module: vkd3d Branch: master Commit: 1eaa7d1dbe71dd9f832f73f7080d418dd9f0470e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1eaa7d1dbe71dd9f832f73f7080d4… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Nov 22 00:36:10 2023 +1000 vkd3d-shader/spirv: Support UINT64 source in spirv_compiler_emit_bool_cast(). --- libs/vkd3d-shader/spirv.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index cc2a2b35..a9a6e97f 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4362,6 +4362,19 @@ static uint32_t spirv_compiler_emit_bool_to_int(struct spirv_compiler *compiler, return vkd3d_spirv_build_op_select(builder, type_id, val_id, true_id, false_id); } +static uint32_t spirv_compiler_emit_bool_to_int64(struct spirv_compiler *compiler, + unsigned int component_count, uint32_t val_id, bool signedness) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + uint32_t type_id, true_id, false_id; + + true_id = spirv_compiler_get_constant_uint64_vector(compiler, signedness ? UINT64_MAX : 1, + component_count); + false_id = spirv_compiler_get_constant_uint64_vector(compiler, 0, component_count); + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_UINT64, component_count); + return vkd3d_spirv_build_op_select(builder, type_id, val_id, true_id, false_id); +} + static uint32_t spirv_compiler_emit_bool_to_float(struct spirv_compiler *compiler, unsigned int component_count, uint32_t val_id, bool signedness) { @@ -6741,6 +6754,10 @@ static void spirv_compiler_emit_bool_cast(struct spirv_compiler *compiler, { val_id = spirv_compiler_emit_bool_to_int(compiler, 1, val_id, instruction->handler_idx == VKD3DSIH_ITOI); } + else if (dst->reg.data_type == VKD3D_DATA_UINT64) + { + val_id = spirv_compiler_emit_bool_to_int64(compiler, 1, val_id, instruction->handler_idx == VKD3DSIH_ITOI); + } else { WARN("Unhandled data type %u.\n", dst->reg.data_type);

1 0