- Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll/tests: Fix a test failure when exception information is missing.
by Alexandre Julliard Feb. 23, 2024

Feb. 23, 2024

Module: wine Branch: master Commit: 2e6651cb363c844ce4eb8feee41329b527127e8b URL: https://gitlab.winehq.org/wine/wine/-/commit/2e6651cb363c844ce4eb8feee41329… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 23 17:00:28 2024 +0100 ntdll/tests: Fix a test failure when exception information is missing. --- dlls/ntdll/tests/unwind.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/unwind.c b/dlls/ntdll/tests/unwind.c index a68bda6c748..dcfd854142d 100644 --- a/dlls/ntdll/tests/unwind.c +++ b/dlls/ntdll/tests/unwind.c @@ -1583,6 +1583,9 @@ static void call_virtual_unwind_arm64( void *code_mem, int testnum, const struct for (i = 0; i < test->nb_results; i++) { +#ifdef __x86_64__ + if (test->results[i].handler == -2) continue; /* skip invalid leaf function test */ +#endif winetest_push_context( "%u/%u", testnum, i ); memset( &ctx_ptr, 0x55, sizeof(ctx_ptr) ); memset( &context, 0x55, sizeof(context) ); @@ -1602,11 +1605,7 @@ static void call_virtual_unwind_arm64( void *code_mem, int testnum, const struct data = (void *)0xdeadbeef; frame = 0xdeadbeef; -#ifdef __x86_64__ - if (test->results[i].handler == -2) continue; /* skip invalid leaf function test */ -#else if (test->results[i].handler == -2) orig_pc = context.Lr; -#endif handler = RtlVirtualUnwind( UNW_FLAG_EHANDLER, (ULONG64)code_mem, orig_pc, test->unwind_info ? (RUNTIME_FUNCTION *)&runtime_func : NULL, (CONTEXT *)&context, &data, &frame, &ctx_ptr ); @@ -3226,12 +3225,13 @@ static void test_dynamic_unwind(void) ok( base == 0xdeadbeef, "RtlLookupFunctionTable wrong base, got: %Ix\n", base ); base = 0xdeadbeef; + len = 0xdeadbeef; func = pRtlLookupFunctionTable( (ULONG_PTR)pRtlLookupFunctionEntry, &base, &len ); ok( base == (ULONG_PTR)GetModuleHandleA("ntdll.dll"), "RtlLookupFunctionTable wrong base, got: %Ix / %p\n", base, GetModuleHandleA("ntdll.dll") ); ptr = RtlImageDirectoryEntryToData( (void *)base, TRUE, IMAGE_DIRECTORY_ENTRY_EXCEPTION, &len2 ); ok( func == ptr, "RtlLookupFunctionTable wrong table, got: %p / %p\n", func, ptr ); - ok( len == len2, "RtlLookupFunctionTable wrong len, got: %lu / %lu\n", len, len2 ); + ok( len == len2 || !ptr, "RtlLookupFunctionTable wrong len, got: %lu / %lu\n", len, len2 ); pRtlDeleteGrowableFunctionTable( growable_table );

1 0

Alexandre Julliard : configure: Require floating point support on ARM targets.
by Alexandre Julliard Feb. 23, 2024

Feb. 23, 2024

Module: wine Branch: master Commit: 71a2e64aee90c9cae76e100497f1a09b5f373415 URL: https://gitlab.winehq.org/wine/wine/-/commit/71a2e64aee90c9cae76e100497f1a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 23 11:41:40 2024 +0100 configure: Require floating point support on ARM targets. PE code requires hardware floating point. --- configure | 35 +++-------------------------------- configure.ac | 27 +++------------------------ 2 files changed, 6 insertions(+), 56 deletions(-) diff --git a/configure b/configure index 026966a800d..59fa33ee6e7 100755 --- a/configure +++ b/configure @@ -929,7 +929,6 @@ with_capi with_coreaudio with_cups with_dbus -with_float_abi with_fontconfig with_freetype with_gettext @@ -2489,7 +2488,6 @@ Optional Packages: --without-coreaudio do not use the CoreAudio sound support --without-cups do not use CUPS --without-dbus do not use DBus (dynamic device support) - --with-float-abi=abi specify the ABI (soft|softfp|hard) for ARM platforms --without-fontconfig do not use fontconfig --without-freetype do not use the FreeType library --without-gettext do not use gettext @@ -4273,13 +4271,6 @@ then : fi -# Check whether --with-float-abi was given. -if test ${with_float_abi+y} -then : - withval=$with_float_abi; -fi - - # Check whether --with-fontconfig was given. if test ${with_fontconfig+y} then : @@ -6367,19 +6358,8 @@ printf "%s\n" "$wine_cv_thumb2" >&6; } else CFLAGS="$CFLAGS -marm" fi - case $with_float_abi in - soft|softfp|hard) - float_abi=$with_float_abi ;; - *) - case $host_os in - *eabihf) - float_abi=hard ;; - *) - float_abi=softfp - saved_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS -mfloat-abi=$float_abi" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -mfloat-abi=$float_abi" >&5 -printf %s "checking whether $CC supports -mfloat-abi=$float_abi... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports floating point instructions" >&5 +printf %s "checking whether $CC supports floating point instructions... " >&6; } if test ${wine_cv_float_abi+y} then : printf %s "(cached) " >&6 @@ -6406,16 +6386,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wine_cv_float_abi" >&5 printf "%s\n" "$wine_cv_float_abi" >&6; } - if test $wine_cv_float_abi = no - then - float_abi=soft - as_fn_append wine_warnings "|Floating point is not supported for this target. The resulting build won't be compatible with Windows ARM binaries." - fi - CFLAGS=$saved_CFLAGS - esac - ;; - esac - CFLAGS="$CFLAGS -mfloat-abi=$float_abi" + test $wine_cv_float_abi != no || as_fn_error $? "The ARM target needs to support floating point instructions." "$LINENO" 5 ;; esac diff --git a/configure.ac b/configure.ac index 2909bea2460..1c59651ba1e 100644 --- a/configure.ac +++ b/configure.ac @@ -29,7 +29,6 @@ AC_ARG_WITH(capi, AS_HELP_STRING([--without-capi],[do not use CAPI (ISDN su AC_ARG_WITH(coreaudio, AS_HELP_STRING([--without-coreaudio],[do not use the CoreAudio sound support])) AC_ARG_WITH(cups, AS_HELP_STRING([--without-cups],[do not use CUPS])) AC_ARG_WITH(dbus, AS_HELP_STRING([--without-dbus],[do not use DBus (dynamic device support)])) -AC_ARG_WITH(float-abi, AS_HELP_STRING([--with-float-abi=abi],[specify the ABI (soft|softfp|hard) for ARM platforms])) AC_ARG_WITH(fontconfig,AS_HELP_STRING([--without-fontconfig],[do not use fontconfig])) AC_ARG_WITH(freetype, AS_HELP_STRING([--without-freetype],[do not use the FreeType library])) AC_ARG_WITH(gettext, AS_HELP_STRING([--without-gettext],[do not use gettext])) @@ -149,29 +148,9 @@ case $host in else CFLAGS="$CFLAGS -marm" fi - case $with_float_abi in - soft|softfp|hard) - float_abi=$with_float_abi ;; - *) - case $host_os in - *eabihf) - float_abi=hard ;; - *) - float_abi=softfp - saved_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS -mfloat-abi=$float_abi" - AC_CACHE_CHECK([whether $CC supports -mfloat-abi=$float_abi],wine_cv_float_abi, - [WINE_TRY_ASM_LINK(["vmrs r2,fpscr"],,,[wine_cv_float_abi=yes],[wine_cv_float_abi=no])]) - if test $wine_cv_float_abi = no - then - float_abi=soft - WINE_WARNING([Floating point is not supported for this target. The resulting build won't be compatible with Windows ARM binaries.]) - fi - CFLAGS=$saved_CFLAGS - esac - ;; - esac - CFLAGS="$CFLAGS -mfloat-abi=$float_abi" + AC_CACHE_CHECK([whether $CC supports floating point instructions],wine_cv_float_abi, + [WINE_TRY_ASM_LINK(["vmrs r2,fpscr"],,,[wine_cv_float_abi=yes],[wine_cv_float_abi=no])]) + test $wine_cv_float_abi != no || AC_MSG_ERROR([The ARM target needs to support floating point instructions.]) ;; esac

1 0

Alexandre Julliard : configure: Stop passing ARM code generation options to winebuild.
by Alexandre Julliard Feb. 23, 2024

Feb. 23, 2024

Module: wine Branch: master Commit: 23218818acd33467c04b13397f029e0195a7c56a URL: https://gitlab.winehq.org/wine/wine/-/commit/23218818acd33467c04b13397f029e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 23 11:34:31 2024 +0100 configure: Stop passing ARM code generation options to winebuild. They are not needed for PE builds. --- configure | 3 --- configure.ac | 3 --- 2 files changed, 6 deletions(-) diff --git a/configure b/configure index 5407d32205f..026966a800d 100755 --- a/configure +++ b/configure @@ -6364,10 +6364,8 @@ printf "%s\n" "$wine_cv_thumb2" >&6; } if test x"$wine_cv_thumb2" = xyes then CFLAGS="$CFLAGS -mthumb" - TARGETFLAGS="$TARGETFLAGS -mthumb" else CFLAGS="$CFLAGS -marm" - TARGETFLAGS="$TARGETFLAGS -marm" fi case $with_float_abi in soft|softfp|hard) @@ -6418,7 +6416,6 @@ printf "%s\n" "$wine_cv_float_abi" >&6; } ;; esac CFLAGS="$CFLAGS -mfloat-abi=$float_abi" - TARGETFLAGS="$TARGETFLAGS -mfloat-abi=$float_abi" ;; esac diff --git a/configure.ac b/configure.ac index ad5e43d2d7e..2909bea2460 100644 --- a/configure.ac +++ b/configure.ac @@ -146,10 +146,8 @@ case $host in if test x"$wine_cv_thumb2" = xyes then CFLAGS="$CFLAGS -mthumb" - TARGETFLAGS="$TARGETFLAGS -mthumb" else CFLAGS="$CFLAGS -marm" - TARGETFLAGS="$TARGETFLAGS -marm" fi case $with_float_abi in soft|softfp|hard) @@ -174,7 +172,6 @@ case $host in ;; esac CFLAGS="$CFLAGS -mfloat-abi=$float_abi" - TARGETFLAGS="$TARGETFLAGS -mfloat-abi=$float_abi" ;; esac

1 0

Henri Verbeet : configure: Build with -Wwrite-strings.
by Alexandre Julliard Feb. 22, 2024

Feb. 22, 2024

Module: vkd3d Branch: master Commit: d65f331efc70454312f1e23653703e67b459d7cc URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d65f331efc70454312f1e23653703… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 22 13:08:36 2024 +0100 configure: Build with -Wwrite-strings. libs/vkd3d-shader/hlsl.c: In function ‘declare_predefined_types’: libs/vkd3d-shader/hlsl.c:3408:10: warning: initialization discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers] {"technique", 9}, ^~~~~~~~~~~ ... programs/vkd3d-compiler/main.c: In function ‘parse_formatting’: programs/vkd3d-compiler/main.c:303:10: warning: initialization discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers] {"colour", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_COLOUR}, ^~~~~~~~ ... macOS tigetstr() takes a non-const char *, so account for that as well. --- configure.ac | 1 + libs/vkd3d-shader/hlsl.c | 2 +- programs/vkd3d-compiler/main.c | 4 ++-- programs/vkd3d-dxbc/main.c | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index e2376b0d..caceb445 100644 --- a/configure.ac +++ b/configure.ac @@ -70,6 +70,7 @@ AS_IF([test "x${GCC}" = "xyes"], VKD3D_CHECK_CFLAGS([-Wtype-limits]) VKD3D_CHECK_CFLAGS([-Wunused-but-set-parameter]) VKD3D_CHECK_CFLAGS([-Wvla]) + VKD3D_CHECK_CFLAGS([-Wwrite-strings]) VKD3D_CHECK_CFLAGS([-Wl,--no-undefined])]) dnl Check for cross compilers diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 978c414d..0e75edd4 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -3403,7 +3403,7 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) static const struct { - char *name; + const char *name; unsigned int version; } technique_types[] = diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 3fa54aad..fdb1cade 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -295,7 +295,7 @@ static bool parse_formatting(uint32_t *formatting, bool *colour, char *arg) { static const struct formatting_option { - char *name; + const char *name; enum vkd3d_shader_compile_option_formatting_flags value; } opts[] = @@ -694,7 +694,7 @@ static bool has_colour(FILE *f) setupterm(NULL, fileno(f), &ret); if (ret != 1) return false; - supported = !!tigetstr("setaf"); + supported = !!tigetstr((char *)"setaf"); del_curterm(cur_term); return supported; diff --git a/programs/vkd3d-dxbc/main.c b/programs/vkd3d-dxbc/main.c index b6786b71..e76bcb63 100644 --- a/programs/vkd3d-dxbc/main.c +++ b/programs/vkd3d-dxbc/main.c @@ -71,7 +71,7 @@ static bool has_colour(void) setupterm(NULL, fileno(stdout), &ret); if (ret != 1) return false; - supported = !!tigetstr("setaf"); + supported = !!tigetstr((char *)"setaf"); del_curterm(cur_term); return supported;

1 0

Henri Verbeet : configure: Build with -Wtype-limits.
by Alexandre Julliard Feb. 22, 2024

Feb. 22, 2024

Module: vkd3d Branch: master Commit: 7029d821bed23e71eafd54d9894ec03f59b606bd URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7029d821bed23e71eafd54d9894ec… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 22 13:03:16 2024 +0100 configure: Build with -Wtype-limits. libs/vkd3d-shader/tpf.c: In function ‘write_sm4_unary_op_with_two_destinations’: libs/vkd3d-shader/tpf.c:4489:24: warning: comparison of unsigned expression >= 0 is always true [-Wtype-limits] assert(1 - dst_idx >= 0); ^~ libs/vkd3d-shader/tpf.c: In function ‘write_sm4_binary_op_with_two_destinations’: libs/vkd3d-shader/tpf.c:4549:24: warning: comparison of unsigned expression >= 0 is always true [-Wtype-limits] assert(1 - dst_idx >= 0); ^~ --- configure.ac | 1 + libs/vkd3d-shader/tpf.c | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 6d352895..e2376b0d 100644 --- a/configure.ac +++ b/configure.ac @@ -67,6 +67,7 @@ AS_IF([test "x${GCC}" = "xyes"], VKD3D_CHECK_CFLAGS([-Wpointer-arith]) VKD3D_CHECK_CFLAGS([-Wshadow]) VKD3D_CHECK_CFLAGS([-Wshift-overflow=2]) + VKD3D_CHECK_CFLAGS([-Wtype-limits]) VKD3D_CHECK_CFLAGS([-Wunused-but-set-parameter]) VKD3D_CHECK_CFLAGS([-Wvla]) VKD3D_CHECK_CFLAGS([-Wl,--no-undefined])]) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 10dde985..c6cf1c95 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -4477,7 +4477,7 @@ static void write_sm4_unary_op(const struct tpf_writer *tpf, enum vkd3d_sm4_opco } static void write_sm4_unary_op_with_two_destinations(const struct tpf_writer *tpf, enum vkd3d_sm4_opcode opcode, - const struct hlsl_ir_node *dst, unsigned dst_idx, const struct hlsl_ir_node *src) + const struct hlsl_ir_node *dst, unsigned int dst_idx, const struct hlsl_ir_node *src) { struct sm4_instruction instr; @@ -4486,7 +4486,6 @@ static void write_sm4_unary_op_with_two_destinations(const struct tpf_writer *tp assert(dst_idx < ARRAY_SIZE(instr.dsts)); sm4_dst_from_node(&instr.dsts[dst_idx], dst); - assert(1 - dst_idx >= 0); instr.dsts[1 - dst_idx].reg.type = VKD3DSPR_NULL; instr.dsts[1 - dst_idx].reg.dimension = VSIR_DIMENSION_NONE; instr.dsts[1 - dst_idx].reg.idx_count = 0; @@ -4536,7 +4535,7 @@ static void write_sm4_binary_op_dot(const struct tpf_writer *tpf, enum vkd3d_sm4 } static void write_sm4_binary_op_with_two_destinations(const struct tpf_writer *tpf, - enum vkd3d_sm4_opcode opcode, const struct hlsl_ir_node *dst, unsigned dst_idx, + enum vkd3d_sm4_opcode opcode, const struct hlsl_ir_node *dst, unsigned int dst_idx, const struct hlsl_ir_node *src1, const struct hlsl_ir_node *src2) { struct sm4_instruction instr; @@ -4546,7 +4545,6 @@ static void write_sm4_binary_op_with_two_destinations(const struct tpf_writer *t assert(dst_idx < ARRAY_SIZE(instr.dsts)); sm4_dst_from_node(&instr.dsts[dst_idx], dst); - assert(1 - dst_idx >= 0); instr.dsts[1 - dst_idx].reg.type = VKD3DSPR_NULL; instr.dsts[1 - dst_idx].reg.dimension = VSIR_DIMENSION_NONE; instr.dsts[1 - dst_idx].reg.idx_count = 0;

1 0

Henri Verbeet : configure: Build with -Wshift-overflow=2.
by Alexandre Julliard Feb. 22, 2024

Feb. 22, 2024

Module: vkd3d Branch: master Commit: d155071f2268da0572889365642488a8fddf111d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d155071f2268da057288936564248… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 22 13:01:24 2024 +0100 configure: Build with -Wshift-overflow=2. --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index 7fe70615..6d352895 100644 --- a/configure.ac +++ b/configure.ac @@ -66,6 +66,7 @@ AS_IF([test "x${GCC}" = "xyes"], VKD3D_CHECK_CFLAGS([-Wmissing-prototypes]) VKD3D_CHECK_CFLAGS([-Wpointer-arith]) VKD3D_CHECK_CFLAGS([-Wshadow]) + VKD3D_CHECK_CFLAGS([-Wshift-overflow=2]) VKD3D_CHECK_CFLAGS([-Wunused-but-set-parameter]) VKD3D_CHECK_CFLAGS([-Wvla]) VKD3D_CHECK_CFLAGS([-Wl,--no-undefined])])

1 0

Henri Verbeet : vkd3d: Disable "robustBufferAccess2" as well when we disable "robustBufferAccess".
by Alexandre Julliard Feb. 22, 2024

Feb. 22, 2024

Module: vkd3d Branch: master Commit: 773f02d82fb911db89eb8e338c97cc327fc7a0e2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/773f02d82fb911db89eb8e338c97c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 22 12:43:48 2024 +0100 vkd3d: Disable "robustBufferAccess2" as well when we disable "robustBufferAccess". >From the validation layers: "If robustBufferAccess2 is enabled then robustBufferAccess must also be enabled (https://www.khronos.org/registry/vulkan/specs/1.2-extensions/html/vkspec.ht…)" --- libs/vkd3d/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 01818458..0f45b68f 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1704,6 +1704,7 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, { WARN("Disabling robust buffer access for the update after bind feature.\n"); features->robustBufferAccess = VK_FALSE; + physical_device_info->robustness2_features.robustBufferAccess2 = VK_FALSE; } /* Select descriptor heap implementation. Forcing virtual heaps may be useful if

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement DX intrinsics SampleCmp and SampleCmpLevelZero.
by Alexandre Julliard Feb. 22, 2024

Feb. 22, 2024

Module: vkd3d Branch: master Commit: ba4bd651e5e39b0bbf47073f8e58202a5493e1c8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ba4bd651e5e39b0bbf47073f8e582… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Feb 22 16:56:38 2024 +1000 vkd3d-shader/dxil: Implement DX intrinsics SampleCmp and SampleCmpLevelZero. --- libs/vkd3d-shader/dxil.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index bcd83f51..ac688e85 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -382,6 +382,8 @@ enum dx_intrinsic_opcode DX_SAMPLE_B = 61, DX_SAMPLE_LOD = 62, DX_SAMPLE_GRAD = 63, + DX_SAMPLE_C = 64, + DX_SAMPLE_C_LZ = 65, DX_TEXTURE_LOAD = 66, DX_TEXTURE_STORE = 67, DX_BUFFER_LOAD = 68, @@ -4336,11 +4338,11 @@ static void instruction_set_texel_offset(struct vkd3d_shader_instruction *ins, static void sm6_parser_emit_dx_sample(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, const struct sm6_value **operands, struct function_emission_state *state) { + unsigned int clamp_idx = 0, component_count = VKD3D_VEC4_SIZE; struct vkd3d_shader_register coord, ddx, ddy; const struct sm6_value *resource, *sampler; struct vkd3d_shader_src_param *src_params; struct vkd3d_shader_instruction *ins; - unsigned int clamp_idx = 0; resource = operands[0]; sampler = operands[1]; @@ -4378,6 +4380,16 @@ static void sm6_parser_emit_dx_sample(struct sm6_parser *sm6, enum dx_intrinsic_ src_params = instruction_src_params_alloc(ins, 4, sm6); src_param_init_from_value(&src_params[3], operands[9]); break; + case DX_SAMPLE_C: + clamp_idx = 10; + /* fall through */ + case DX_SAMPLE_C_LZ: + instruction_init_with_resource(ins, (op == DX_SAMPLE_C_LZ) ? VKD3DSIH_SAMPLE_C_LZ : VKD3DSIH_SAMPLE_C, + resource, sm6); + src_params = instruction_src_params_alloc(ins, 4, sm6); + src_param_init_from_value(&src_params[3], operands[9]); + component_count = 1; + break; case DX_SAMPLE_GRAD: instruction_init_with_resource(ins, VKD3DSIH_SAMPLE_GRAD, resource, sm6); src_params = instruction_src_params_alloc(ins, 5, sm6); @@ -4404,7 +4416,7 @@ static void sm6_parser_emit_dx_sample(struct sm6_parser *sm6, enum dx_intrinsic_ src_param_init_vector_from_reg(&src_params[2], &sampler->u.handle.reg); instruction_set_texel_offset(ins, &operands[6], sm6); - instruction_dst_param_init_ssa_vector(ins, VKD3D_VEC4_SIZE, sm6); + instruction_dst_param_init_ssa_vector(ins, component_count, sm6); } static void sm6_parser_emit_dx_sincos(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, @@ -4666,6 +4678,8 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_RSQRT ] = {"g", "R", sm6_parser_emit_dx_unary}, [DX_SAMPLE ] = {"o", "HHffffiiif", sm6_parser_emit_dx_sample}, [DX_SAMPLE_B ] = {"o", "HHffffiiiff", sm6_parser_emit_dx_sample}, + [DX_SAMPLE_C ] = {"o", "HHffffiiiff", sm6_parser_emit_dx_sample}, + [DX_SAMPLE_C_LZ ] = {"o", "HHffffiiif", sm6_parser_emit_dx_sample}, [DX_SAMPLE_GRAD ] = {"o", "HHffffiiifffffff", sm6_parser_emit_dx_sample}, [DX_SAMPLE_LOD ] = {"o", "HHffffiiif", sm6_parser_emit_dx_sample}, [DX_SIN ] = {"g", "R", sm6_parser_emit_dx_sincos},

1 0

Henri Verbeet : configure: Build with -Wempty-body.
by Alexandre Julliard Feb. 22, 2024

Feb. 22, 2024

Module: vkd3d Branch: master Commit: 1ed47677650df3ef1ecc6041da4a655810975485 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1ed47677650df3ef1ecc6041da4a6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 22 12:59:49 2024 +0100 configure: Build with -Wempty-body. --- configure.ac | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 4cb229d5..7fe70615 100644 --- a/configure.ac +++ b/configure.ac @@ -59,14 +59,15 @@ AS_IF([test "x${GCC}" = "xyes"], VKD3D_CHECK_CFLAGS([-std=c99]) VKD3D_CHECK_CFLAGS([-fvisibility=hidden]) VKD3D_CHECK_CFLAGS([-Wdeclaration-after-statement]) + VKD3D_CHECK_CFLAGS([-Wempty-body]) + VKD3D_CHECK_CFLAGS([-Wenum-conversion]) VKD3D_CHECK_CFLAGS([-Wimplicit-fallthrough]) VKD3D_CHECK_CFLAGS([-Winit-self]) VKD3D_CHECK_CFLAGS([-Wmissing-prototypes]) + VKD3D_CHECK_CFLAGS([-Wpointer-arith]) VKD3D_CHECK_CFLAGS([-Wshadow]) VKD3D_CHECK_CFLAGS([-Wunused-but-set-parameter]) VKD3D_CHECK_CFLAGS([-Wvla]) - VKD3D_CHECK_CFLAGS([-Wpointer-arith]) - VKD3D_CHECK_CFLAGS([-Wenum-conversion]) VKD3D_CHECK_CFLAGS([-Wl,--no-undefined])]) dnl Check for cross compilers

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Add DepthStencilView object type.
by Alexandre Julliard Feb. 22, 2024

Feb. 22, 2024

Module: vkd3d Branch: master Commit: 371be3b60a84eb99b22ced58c3ee5c8ae3cd0872 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/371be3b60a84eb99b22ced58c3ee5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 11 19:11:57 2024 +0100 vkd3d-shader/hlsl: Add DepthStencilView object type. --- libs/vkd3d-shader/hlsl.c | 7 +++---- libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl.y | 4 ++++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index fffac6bc..2f26b40a 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -3380,7 +3380,7 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) static const struct { - char name[13]; + char name[20]; enum hlsl_type_class class; enum hlsl_base_type base_type; unsigned int dimx, dimy; @@ -3396,6 +3396,8 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) {"TEXTURE", HLSL_CLASS_OBJECT, HLSL_TYPE_TEXTURE, 1, 1}, {"PIXELSHADER", HLSL_CLASS_OBJECT, HLSL_TYPE_PIXELSHADER, 1, 1}, {"VERTEXSHADER", HLSL_CLASS_OBJECT, HLSL_TYPE_VERTEXSHADER, 1, 1}, + {"RenderTargetView",HLSL_CLASS_OBJECT, HLSL_TYPE_RENDERTARGETVIEW, 1, 1}, + {"DepthStencilView",HLSL_CLASS_OBJECT, HLSL_TYPE_DEPTHSTENCILVIEW, 1, 1}, }; static const struct @@ -3521,9 +3523,6 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) type->e.version = technique_types[i].version; hlsl_scope_add_type(ctx->globals, type); } - - type = hlsl_new_type(ctx, "RenderTargetView", HLSL_CLASS_OBJECT, HLSL_TYPE_RENDERTARGETVIEW, 1, 1); - hlsl_scope_add_type(ctx->globals, type); } static bool hlsl_ctx_init(struct hlsl_ctx *ctx, const struct vkd3d_shader_compile_info *compile_info, diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 425ccfe7..74990fb1 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -97,6 +97,7 @@ enum hlsl_base_type HLSL_TYPE_VERTEXSHADER, HLSL_TYPE_PASS, HLSL_TYPE_RENDERTARGETVIEW, + HLSL_TYPE_DEPTHSTENCILVIEW, HLSL_TYPE_TECHNIQUE, HLSL_TYPE_EFFECT_GROUP, HLSL_TYPE_STRING, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 88904832..cd05fd00 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -6450,6 +6450,10 @@ type_no_void: { $$ = hlsl_get_type(ctx->cur_scope, "RenderTargetView", true, true); } + | KW_DEPTHSTENCILVIEW + { + $$ = hlsl_get_type(ctx->cur_scope, "DepthStencilView", true, true); + } type: type_no_void

1 0