November 2023 - Wine-Commits

Jacek Caban : configure: Fix action-if-no handling in WINE_TRY_PE_CFLAGS macro.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: cf29f40ce41ab4611aed9e9ca58d7f5d62ff47e9 URL: https://gitlab.winehq.org/wine/wine/-/commit/cf29f40ce41ab4611aed9e9ca58d7f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 24 19:58:40 2023 +0100 configure: Fix action-if-no handling in WINE_TRY_PE_CFLAGS macro. --- aclocal.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aclocal.m4 b/aclocal.m4 index 11d7e3a3bef..5f1e7bbdbf3 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -218,7 +218,7 @@ int __cdecl mainCRTStartup(void) { return 0; }]])], [AS_VAR_SET(ac_var,yes)], [AS_VAR_SET(ac_var,no)]) CFLAGS=$ac_wine_try_cflags_saved ac_exeext=$ac_wine_try_cflags_saved_exeext]) -AS_VAR_IF([ac_var],[yes],[m4_default([$2], [AS_VAR_APPEND([${wine_arch}_EXTRACFLAGS],[" $1"])], [$3])])dnl +AS_VAR_IF([ac_var],[yes],[m4_default([$2], [AS_VAR_APPEND([${wine_arch}_EXTRACFLAGS],[" $1"])])], [$3])dnl AS_VAR_POPDEF([ac_var]) }]) dnl **** Check whether the given MinGW header is available ****

1 0

Zebediah Figura : ntdll: Check for some more IP socket options at compile time.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: 77a21c6eef894a0c83d4ae2f779778e80522b1e4 URL: https://gitlab.winehq.org/wine/wine/-/commit/77a21c6eef894a0c83d4ae2f779778… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun May 29 19:45:17 2022 -0500 ntdll: Check for some more IP socket options at compile time. NetBSD doesn't provide these. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51843 --- dlls/ntdll/unix/socket.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index c1eba723307..4e6781df607 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1998,11 +1998,15 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_WINE_SET_IP_ADD_MEMBERSHIP: return do_setsockopt( handle, io, IPPROTO_IP, IP_ADD_MEMBERSHIP, in_buffer, in_size ); +#ifdef IP_ADD_SOURCE_MEMBERSHIP case IOCTL_AFD_WINE_SET_IP_ADD_SOURCE_MEMBERSHIP: return do_setsockopt( handle, io, IPPROTO_IP, IP_ADD_SOURCE_MEMBERSHIP, in_buffer, in_size ); +#endif +#ifdef IP_BLOCK_SOURCE case IOCTL_AFD_WINE_SET_IP_BLOCK_SOURCE: return do_setsockopt( handle, io, IPPROTO_IP, IP_BLOCK_SOURCE, in_buffer, in_size ); +#endif case IOCTL_AFD_WINE_GET_IP_DONTFRAGMENT: { @@ -2066,8 +2070,10 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_WINE_SET_IP_DROP_MEMBERSHIP: return do_setsockopt( handle, io, IPPROTO_IP, IP_DROP_MEMBERSHIP, in_buffer, in_size ); +#ifdef IP_ADD_SOURCE_MEMBERSHIP case IOCTL_AFD_WINE_SET_IP_DROP_SOURCE_MEMBERSHIP: return do_setsockopt( handle, io, IPPROTO_IP, IP_DROP_SOURCE_MEMBERSHIP, in_buffer, in_size ); +#endif #ifdef IP_HDRINCL case IOCTL_AFD_WINE_GET_IP_HDRINCL: @@ -2201,8 +2207,10 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_WINE_SET_IP_TTL: return do_setsockopt( handle, io, IPPROTO_IP, IP_TTL, in_buffer, in_size ); +#ifdef IP_UNBLOCK_SOURCE case IOCTL_AFD_WINE_SET_IP_UNBLOCK_SOURCE: return do_setsockopt( handle, io, IPPROTO_IP, IP_UNBLOCK_SOURCE, in_buffer, in_size ); +#endif #ifdef IP_UNICAST_IF case IOCTL_AFD_WINE_GET_IP_UNICAST_IF:

1 0

Zebediah Figura : ws2_32: Check for AI_ALL at compile time.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: 09f7b203bbb27eaad4e6a8318d03bb3a61e238c2 URL: https://gitlab.winehq.org/wine/wine/-/commit/09f7b203bbb27eaad4e6a8318d03bb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun May 29 19:58:04 2022 -0500 ws2_32: Check for AI_ALL at compile time. NetBSD does not provide it. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51843 --- dlls/ws2_32/unixlib.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ws2_32/unixlib.c b/dlls/ws2_32/unixlib.c index 88845e43ad2..e0e1263e025 100644 --- a/dlls/ws2_32/unixlib.c +++ b/dlls/ws2_32/unixlib.c @@ -122,7 +122,9 @@ static const int addrinfo_flag_map[][2] = #ifdef AI_V4MAPPED MAP( AI_V4MAPPED ), #endif +#ifdef AI_ALL MAP( AI_ALL ), +#endif MAP( AI_ADDRCONFIG ), };

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Handle 'linear centroid' modifier.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: vkd3d Branch: master Commit: 6a4a9a4518689a7db5eff362cc5e0fff0994a7af URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6a4a9a4518689a7db5eff362cc5e0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 26 20:36:29 2023 +0100 vkd3d-shader/hlsl: Handle 'linear centroid' modifier. --- libs/vkd3d-shader/hlsl.c | 2 ++ libs/vkd3d-shader/hlsl.h | 3 ++- libs/vkd3d-shader/hlsl.l | 1 + libs/vkd3d-shader/hlsl.y | 5 +++++ libs/vkd3d-shader/tpf.c | 1 + 5 files changed, 11 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 501bff8c..da3bbda1 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -2255,6 +2255,8 @@ struct vkd3d_string_buffer *hlsl_modifiers_to_string(struct hlsl_ctx *ctx, unsig if (modifiers & HLSL_STORAGE_EXTERN) vkd3d_string_buffer_printf(string, "extern "); + if (modifiers & HLSL_STORAGE_LINEAR) + vkd3d_string_buffer_printf(string, "linear "); if (modifiers & HLSL_STORAGE_NOINTERPOLATION) vkd3d_string_buffer_printf(string, "nointerpolation "); if (modifiers & HLSL_STORAGE_CENTROID) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index f3596764..21b2fe38 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -357,13 +357,14 @@ struct hlsl_attribute #define HLSL_MODIFIER_INLINE 0x00002000 #define HLSL_STORAGE_CENTROID 0x00004000 #define HLSL_STORAGE_NOPERSPECTIVE 0x00008000 +#define HLSL_STORAGE_LINEAR 0x00010000 #define HLSL_TYPE_MODIFIERS_MASK (HLSL_MODIFIER_PRECISE | HLSL_MODIFIER_VOLATILE | \ HLSL_MODIFIER_CONST | HLSL_MODIFIER_ROW_MAJOR | \ HLSL_MODIFIER_COLUMN_MAJOR) #define HLSL_INTERPOLATION_MODIFIERS_MASK (HLSL_STORAGE_NOINTERPOLATION | HLSL_STORAGE_CENTROID | \ - HLSL_STORAGE_NOPERSPECTIVE) + HLSL_STORAGE_NOPERSPECTIVE | HLSL_STORAGE_LINEAR) #define HLSL_MODIFIERS_MAJORITY_MASK (HLSL_MODIFIER_ROW_MAJOR | HLSL_MODIFIER_COLUMN_MAJOR) diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index 401fba60..fe838750 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -95,6 +95,7 @@ if {return KW_IF; } in {return KW_IN; } inline {return KW_INLINE; } inout {return KW_INOUT; } +linear {return KW_LINEAR; } matrix {return KW_MATRIX; } namespace {return KW_NAMESPACE; } nointerpolation {return KW_NOINTERPOLATION; } diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 67b01293..0dde4c18 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -4893,6 +4893,7 @@ static void check_duplicated_switch_cases(struct hlsl_ctx *ctx, const struct hls %token KW_IN %token KW_INLINE %token KW_INOUT +%token KW_LINEAR %token KW_MATRIX %token KW_NAMESPACE %token KW_NOINTERPOLATION @@ -6262,6 +6263,10 @@ var_modifiers: { $$ = add_modifiers(ctx, $2, HLSL_STORAGE_CENTROID, &@1); } + | KW_LINEAR var_modifiers + { + $$ = add_modifiers(ctx, $2, HLSL_STORAGE_LINEAR, &@1); + } | KW_NOPERSPECTIVE var_modifiers { $$ = add_modifiers(ctx, $2, HLSL_STORAGE_NOPERSPECTIVE, &@1); diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 81ead41e..80f8ab98 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -4311,6 +4311,7 @@ static void write_sm4_dcl_semantic(const struct tpf_writer *tpf, const struct hl { HLSL_STORAGE_CENTROID | HLSL_STORAGE_NOPERSPECTIVE, VKD3DSIM_LINEAR_NOPERSPECTIVE_CENTROID }, { HLSL_STORAGE_NOPERSPECTIVE, VKD3DSIM_LINEAR_NOPERSPECTIVE }, { HLSL_STORAGE_CENTROID, VKD3DSIM_LINEAR_CENTROID }, + { HLSL_STORAGE_CENTROID | HLSL_STORAGE_LINEAR, VKD3DSIM_LINEAR_CENTROID }, }; unsigned int i;

1 0

Zebediah Figura : tests/shader_runner: Remove an unnecessary local variable declaration.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: vkd3d Branch: master Commit: d1ce069ea6e4a0dfd98e58009716653583eacae4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d1ce069ea6e4a0dfd98e580097166… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Apr 30 17:39:15 2023 -0500 tests/shader_runner: Remove an unnecessary local variable declaration. Found with -Wshadow. --- tests/shader_runner.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 2b875440..0e6104ce 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -618,7 +618,6 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) D3D_PRIMITIVE_TOPOLOGY topology; struct resource_params params; unsigned int vertex_count; - char *rest; if (!shader_runner_get_resource(runner, RESOURCE_TYPE_RENDER_TARGET, 0)) {

1 0

Jacek Caban : configure: Enable -Wenum-conversion warnings.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: vkd3d Branch: master Commit: d7b20d7c01b2de5d2bf7f894e9d623412917c61c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d7b20d7c01b2de5d2bf7f894e9d62… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 27 16:01:19 2023 +0100 configure: Enable -Wenum-conversion warnings. --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index 35617c4f..6cd9d9b7 100644 --- a/configure.ac +++ b/configure.ac @@ -65,6 +65,7 @@ AS_IF([test "x${GCC}" = "xyes"], 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

Zebediah Figura : vkd3d-shader/tpf: Remove an unnecessary local variable declaration.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: vkd3d Branch: master Commit: 10957bebbf7dd09b12808f97c627709e12327a89 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/10957bebbf7dd09b12808f97c6277… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Apr 30 17:41:30 2023 -0500 vkd3d-shader/tpf: Remove an unnecessary local variable declaration. Found with -Wshadow. --- libs/vkd3d-shader/tpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 61d14e30..81ead41e 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3528,8 +3528,8 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) { const unsigned int var_size = (profile->major_version >= 5 ? 10 : 6); size_t var_offset = vars_start + j * var_size * sizeof(uint32_t); - size_t string_offset = put_string(&buffer, var->name); + string_offset = put_string(&buffer, var->name); set_u32(&buffer, var_offset, string_offset); write_sm4_type(ctx, &buffer, var->data_type); set_u32(&buffer, var_offset + 4 * sizeof(uint32_t), var->data_type->bytecode_offset);

1 0

Zebediah Figura : vkd3d-shader/hlsl: Remove an unnecessary local variable in copy_propagation_get_value().
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: vkd3d Branch: master Commit: 2d1825bb893b3280259ca70c3a2a384a9b302454 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2d1825bb893b3280259ca70c3a2a3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Apr 30 17:40:32 2023 -0500 vkd3d-shader/hlsl: Remove an unnecessary local variable in copy_propagation_get_value(). Found with -Wshadow. --- libs/vkd3d-shader/hlsl_codegen.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 294a8156..628de796 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1304,12 +1304,10 @@ static struct copy_propagation_value *copy_propagation_get_value(const struct co { struct copy_propagation_var_def *var_def = RB_ENTRY_VALUE(entry, struct copy_propagation_var_def, entry); unsigned int component_count = hlsl_type_component_count(var->data_type); - enum copy_propagation_value_state state; assert(component < component_count); - state = var_def->values[component].state; - switch (state) + switch (var_def->values[component].state) { case VALUE_STATE_STATICALLY_WRITTEN: return &var_def->values[component];

1 0

Alistair Leslie-Hughes : include: D3D12_RT_FORMAT_ARRAY remove typedef to make header compatible with windows.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: vkd3d Branch: master Commit: 5c134d44d6cd9145b810c216cb6fca7af16b0af4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5c134d44d6cd9145b810c216cb6fc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Nov 24 19:06:32 2023 +1100 include: D3D12_RT_FORMAT_ARRAY remove typedef to make header compatible with windows. windows d3d12.idl doesn't have this as a typedef. --- include/vkd3d_d3d12.idl | 4 ++-- libs/vkd3d/state.c | 2 +- libs/vkd3d/vkd3d_private.h | 2 +- tests/d3d12.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index cdd3acec..9b1b494c 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -2129,11 +2129,11 @@ typedef struct D3D12_PIPELINE_STATE_STREAM_DESC void *pPipelineStateSubobjectStream; } D3D12_PIPELINE_STATE_STREAM_DESC; -typedef struct D3D12_RT_FORMAT_ARRAY +struct D3D12_RT_FORMAT_ARRAY { DXGI_FORMAT RTFormats[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT]; UINT NumRenderTargets; -} D3D12_RT_FORMAT_ARRAY; +}; typedef enum D3D12_PIPELINE_STATE_SUBOBJECT_TYPE { diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index de0e04ea..6665a1fd 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1839,7 +1839,7 @@ static HRESULT pipeline_state_desc_from_d3d12_stream_desc(struct d3d12_pipeline_ [D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_INPUT_LAYOUT] = DCL_SUBOBJECT_INFO(D3D12_INPUT_LAYOUT_DESC, input_layout), [D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_IB_STRIP_CUT_VALUE] = DCL_SUBOBJECT_INFO(D3D12_INDEX_BUFFER_STRIP_CUT_VALUE, strip_cut_value), [D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_PRIMITIVE_TOPOLOGY] = DCL_SUBOBJECT_INFO(D3D12_PRIMITIVE_TOPOLOGY_TYPE, primitive_topology_type), - [D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_RENDER_TARGET_FORMATS] = DCL_SUBOBJECT_INFO(D3D12_RT_FORMAT_ARRAY, rtv_formats), + [D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_RENDER_TARGET_FORMATS] = DCL_SUBOBJECT_INFO(struct D3D12_RT_FORMAT_ARRAY, rtv_formats), [D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_DEPTH_STENCIL_FORMAT] = DCL_SUBOBJECT_INFO(DXGI_FORMAT, dsv_format), [D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_SAMPLE_DESC] = DCL_SUBOBJECT_INFO(DXGI_SAMPLE_DESC, sample_desc), [D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_NODE_MASK] = DCL_SUBOBJECT_INFO(UINT, node_mask), diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 04ba3498..e0eb9f3d 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1334,7 +1334,7 @@ struct d3d12_pipeline_state_desc D3D12_INPUT_LAYOUT_DESC input_layout; D3D12_INDEX_BUFFER_STRIP_CUT_VALUE strip_cut_value; D3D12_PRIMITIVE_TOPOLOGY_TYPE primitive_topology_type; - D3D12_RT_FORMAT_ARRAY rtv_formats; + struct D3D12_RT_FORMAT_ARRAY rtv_formats; DXGI_FORMAT dsv_format; DXGI_SAMPLE_DESC sample_desc; D3D12_VIEW_INSTANCING_DESC view_instancing_desc; diff --git a/tests/d3d12.c b/tests/d3d12.c index 8727fd9e..91e91608 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -3265,7 +3265,7 @@ static void test_create_pipeline_state(void) struct d3d12_render_target_formats_subobject { DECLSPEC_ALIGN(sizeof(void *)) D3D12_PIPELINE_STATE_SUBOBJECT_TYPE type; - D3D12_RT_FORMAT_ARRAY render_target_formats; + struct D3D12_RT_FORMAT_ARRAY render_target_formats; }; struct d3d12_depth_stencil_format_subobject

1 0

Jacek Caban : vkd3d-shader: Avoid implicit enum pointer casts in allocate_semantic_register.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: vkd3d Branch: master Commit: 85f21f197c9cbd9df8fa3d292b0e3de388fdbf65 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/85f21f197c9cbd9df8fa3d292b0e3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 24 14:03:25 2023 +0100 vkd3d-shader: Avoid implicit enum pointer casts in allocate_semantic_register. --- libs/vkd3d-shader/hlsl_codegen.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 5a70878b..294a8156 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -4089,7 +4089,7 @@ static void allocate_semantic_register(struct hlsl_ctx *ctx, struct hlsl_ir_var [VKD3D_SHADER_TYPE_COMPUTE] = "Compute", }; - unsigned int type; + enum vkd3d_shader_register_type type; uint32_t reg; bool builtin; @@ -4097,6 +4097,7 @@ static void allocate_semantic_register(struct hlsl_ctx *ctx, struct hlsl_ir_var if (ctx->profile->major_version < 4) { + D3DSHADER_PARAM_REGISTER_TYPE sm1_type; D3DDECLUSAGE usage; uint32_t usage_idx; @@ -4104,7 +4105,7 @@ static void allocate_semantic_register(struct hlsl_ctx *ctx, struct hlsl_ir_var if (ctx->profile->major_version == 1 && output && ctx->profile->type == VKD3D_SHADER_TYPE_PIXEL) return; - builtin = hlsl_sm1_register_from_semantic(ctx, &var->semantic, output, &type, &reg); + builtin = hlsl_sm1_register_from_semantic(ctx, &var->semantic, output, &sm1_type, &reg); if (!builtin && !hlsl_sm1_usage_from_semantic(&var->semantic, &usage, &usage_idx)) { hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SEMANTIC, @@ -4114,6 +4115,7 @@ static void allocate_semantic_register(struct hlsl_ctx *ctx, struct hlsl_ir_var if ((!output && !var->last_read) || (output && !var->first_write)) return; + type = (enum vkd3d_shader_register_type)sm1_type; } else {

1 0