January 2024 - Wine-Commits

Giovanni Mascellani : vkd3d-shader/ir: Validate destination write masks depending on the dimension.
by Alexandre Julliard Jan. 4, 2024

Jan. 4, 2024

Module: vkd3d Branch: master Commit: bd9118cac475ff7f59eb08303e261efe9c4ada99 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/bd9118cac475ff7f59eb08303e261… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Dec 21 16:04:10 2023 +0100 vkd3d-shader/ir: Validate destination write masks depending on the dimension. --- libs/vkd3d-shader/ir.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 35a95c2b..bac42691 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -1649,6 +1649,26 @@ static void vsir_validate_dst_param(struct validation_context *ctx, validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_WRITE_MASK, "Destination has invalid write mask %#x.", dst->write_mask); + switch (dst->reg.dimension) + { + case VSIR_DIMENSION_SCALAR: + if (dst->write_mask != VKD3DSP_WRITEMASK_0) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_WRITE_MASK, "Scalar destination has invalid write mask %#x.", + dst->write_mask); + break; + + case VSIR_DIMENSION_VEC4: + if (dst->write_mask == 0) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_WRITE_MASK, "Vec4 destination has empty write mask."); + break; + + default: + if (dst->write_mask != 0) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_WRITE_MASK, "Destination of dimension %u has invalid write mask %#x.", + dst->reg.dimension, dst->write_mask); + break; + } + if (dst->modifiers & ~VKD3DSPDM_MASK) validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_MODIFIERS, "Destination has invalid modifiers %#x.", dst->modifiers);

1 0

Henri Verbeet : vkd3d-shader/ir: Store destination parameter modifier flags as a uint32_t.
by Alexandre Julliard Jan. 4, 2024

Jan. 4, 2024

Module: vkd3d Branch: master Commit: 4b5d3a078b10889b4838a967a7a896f34c6824b5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4b5d3a078b10889b4838a967a7a89… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 6 00:16:06 2023 +0100 vkd3d-shader/ir: Store destination parameter modifier flags as a uint32_t. --- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 317fa6d8..f9918b26 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -871,7 +871,7 @@ struct vkd3d_shader_dst_param { struct vkd3d_shader_register reg; uint32_t write_mask; - DWORD modifiers; + uint32_t modifiers; DWORD shift; };

1 0

Henri Verbeet : vkd3d-shader/ir: Store instruction flags as a uint32_t.
by Alexandre Julliard Jan. 4, 2024

Jan. 4, 2024

Module: vkd3d Branch: master Commit: 9f4ca3bc9ccf418049a5e890d0a367fc90dfb277 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9f4ca3bc9ccf418049a5e890d0a36… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 5 23:44:05 2023 +0100 vkd3d-shader/ir: Store instruction flags as a uint32_t. --- libs/vkd3d-shader/spirv.c | 2 +- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 7a33a570..671f4689 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -9420,9 +9420,9 @@ static void spirv_compiler_emit_sync(struct spirv_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { unsigned int memory_semantics = SpvMemorySemanticsAcquireReleaseMask; - unsigned int flags = instruction->flags; SpvScope execution_scope = SpvScopeMax; SpvScope memory_scope = SpvScopeDevice; + uint32_t flags = instruction->flags; if (flags & VKD3DSSF_GROUP_SHARED_MEMORY) { diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index b9fd3cb1..29513f16 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1123,7 +1123,7 @@ struct vkd3d_shader_instruction { struct vkd3d_shader_location location; enum vkd3d_shader_opcode handler_idx; - DWORD flags; + uint32_t flags; unsigned int dst_count; unsigned int src_count; const struct vkd3d_shader_dst_param *dst;

1 0

Henri Verbeet : vkd3d-shader/ir: Store source parameter swizzles as a uint32_t.
by Alexandre Julliard Jan. 4, 2024

Jan. 4, 2024

Module: vkd3d Branch: master Commit: 60842b7181b65e2fe2a9de88608e427efd93c7ee URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/60842b7181b65e2fe2a9de88608e4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 6 00:08:25 2023 +0100 vkd3d-shader/ir: Store source parameter swizzles as a uint32_t. --- libs/vkd3d-shader/spirv.c | 7 +++---- libs/vkd3d-shader/tpf.c | 2 +- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 671f4689..aa8ceaa6 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3600,8 +3600,7 @@ static uint32_t spirv_compiler_get_register_id(struct spirv_compiler *compiler, SpvStorageClassPrivate, VKD3D_SHADER_COMPONENT_FLOAT, VKD3D_VEC4_SIZE); } -static bool vkd3d_swizzle_is_equal(unsigned int dst_write_mask, - unsigned int swizzle, unsigned int write_mask) +static bool vkd3d_swizzle_is_equal(uint32_t dst_write_mask, uint32_t swizzle, uint32_t write_mask) { return vkd3d_compact_swizzle(VKD3D_SHADER_NO_SWIZZLE, dst_write_mask) == vkd3d_compact_swizzle(swizzle, write_mask); } @@ -3913,7 +3912,7 @@ static uint32_t spirv_compiler_emit_load_ssa_reg(struct spirv_compiler *compiler } static uint32_t spirv_compiler_emit_load_reg(struct spirv_compiler *compiler, - const struct vkd3d_shader_register *reg, DWORD swizzle, uint32_t write_mask) + const struct vkd3d_shader_register *reg, uint32_t swizzle, uint32_t write_mask) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; enum vkd3d_shader_component_type component_type; @@ -4209,7 +4208,7 @@ static void spirv_compiler_emit_store_dst(struct spirv_compiler *compiler, static void spirv_compiler_emit_store_dst_swizzled(struct spirv_compiler *compiler, const struct vkd3d_shader_dst_param *dst, uint32_t val_id, - enum vkd3d_shader_component_type component_type, DWORD swizzle) + enum vkd3d_shader_component_type component_type, uint32_t swizzle) { struct vkd3d_shader_dst_param typed_dst = *dst; val_id = spirv_compiler_emit_swizzle(compiler, diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index f859e758..2cc56663 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -5488,7 +5488,7 @@ static void write_sm4_loop(const struct tpf_writer *tpf, const struct hlsl_ir_lo static void write_sm4_gather(const struct tpf_writer *tpf, const struct hlsl_ir_node *dst, const struct hlsl_deref *resource, const struct hlsl_deref *sampler, - const struct hlsl_ir_node *coords, DWORD swizzle, const struct hlsl_ir_node *texel_offset) + const struct hlsl_ir_node *coords, uint32_t swizzle, const struct hlsl_ir_node *texel_offset) { struct vkd3d_shader_src_param *src; struct sm4_instruction instr; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 29513f16..317fa6d8 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -878,7 +878,7 @@ struct vkd3d_shader_dst_param struct vkd3d_shader_src_param { struct vkd3d_shader_register reg; - DWORD swizzle; + uint32_t swizzle; enum vkd3d_shader_src_modifier modifiers; };

1 0

Henri Verbeet : vkd3d: Recognise VK_QUEUE_VIDEO_DECODE_BIT_KHR in debug_vk_queue_flags().
by Alexandre Julliard Jan. 4, 2024

Jan. 4, 2024

Module: vkd3d Branch: master Commit: 0fb1ef1e63cd1c3c95025e7b828cd19ad68f464f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0fb1ef1e63cd1c3c95025e7b828cd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 3 16:25:41 2024 +0100 vkd3d: Recognise VK_QUEUE_VIDEO_DECODE_BIT_KHR in debug_vk_queue_flags(). This was introduced by Vulkan-Headers 1.3.238, which is a bit newer than we currently require. --- libs/vkd3d/utils.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 2541690e..285df1a0 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -683,7 +683,7 @@ const char *debug_vk_extent_3d(VkExtent3D extent) const char *debug_vk_queue_flags(VkQueueFlags flags) { - char buffer[127]; + char buffer[159]; buffer[0] = '\0'; #define FLAG_TO_STR(f) if (flags & f) { strcat(buffer, " | "#f); flags &= ~f; } @@ -692,6 +692,9 @@ const char *debug_vk_queue_flags(VkQueueFlags flags) FLAG_TO_STR(VK_QUEUE_TRANSFER_BIT) FLAG_TO_STR(VK_QUEUE_SPARSE_BINDING_BIT) FLAG_TO_STR(VK_QUEUE_PROTECTED_BIT) +#undef FLAG_TO_STR +#define FLAG_TO_STR(f, n) if (flags & f) { strcat(buffer, " | "#n); flags &= ~f; } + FLAG_TO_STR(0x20, VK_QUEUE_VIDEO_DECODE_BIT_KHR) #undef FLAG_TO_STR if (flags) FIXME("Unrecognized flag(s) %#x.\n", flags);

1 0

Giovanni Mascellani : vkd3d-shader/dxil: Create constant buffer registers with dimension vec4.
by Alexandre Julliard Jan. 4, 2024

Jan. 4, 2024

Module: vkd3d Branch: master Commit: e29ae1550c4b06189cfba00a11c05d0ccc58ec3b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e29ae1550c4b06189cfba00a11c05… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Dec 21 22:37:32 2023 +0100 vkd3d-shader/dxil: Create constant buffer registers with dimension vec4. --- libs/vkd3d-shader/dxil.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 2424b176..c744dfce 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -3432,6 +3432,7 @@ static void sm6_parser_emit_dx_create_handle(struct sm6_parser *sm6, struct sm6_ /* Set idx_count to 3 for use with load instructions. * TODO: set register type from resource type when other types are supported. */ vsir_register_init(reg, VKD3DSPR_CONSTBUFFER, VKD3D_DATA_FLOAT, 3); + reg->dimension = VSIR_DIMENSION_VEC4; reg->idx[0].offset = id; register_index_address_init(&reg->idx[1], operands[2], sm6); reg->non_uniform = !!sm6_value_get_constant_uint(operands[3]);

1 0

Giovanni Mascellani : vkd3d-shader/d3dbc: Override the write mask when the destination is not vec4.
by Alexandre Julliard Jan. 4, 2024

Jan. 4, 2024

Module: vkd3d Branch: master Commit: df2ae56de8a99729bf37673fd6fe952a2289e324 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/df2ae56de8a99729bf37673fd6fe9… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Dec 22 14:25:44 2023 +0100 vkd3d-shader/d3dbc: Override the write mask when the destination is not vec4. --- libs/vkd3d-shader/d3dbc.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 67f9e280..8fec1e63 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -482,9 +482,23 @@ static void shader_sm1_parse_dst_param(uint32_t param, const struct vkd3d_shader dst->reg.dimension = VSIR_DIMENSION_SCALAR; else dst->reg.dimension = VSIR_DIMENSION_VEC4; - dst->write_mask = (param & VKD3D_SM1_WRITEMASK_MASK) >> VKD3D_SM1_WRITEMASK_SHIFT; dst->modifiers = (param & VKD3D_SM1_DST_MODIFIER_MASK) >> VKD3D_SM1_DST_MODIFIER_SHIFT; dst->shift = (param & VKD3D_SM1_DSTSHIFT_MASK) >> VKD3D_SM1_DSTSHIFT_SHIFT; + + switch (dst->reg.dimension) + { + case VSIR_DIMENSION_SCALAR: + dst->write_mask = VKD3DSP_WRITEMASK_0; + break; + + case VSIR_DIMENSION_VEC4: + dst->write_mask = (param & VKD3D_SM1_WRITEMASK_MASK) >> VKD3D_SM1_WRITEMASK_SHIFT; + break; + + default: + dst->write_mask = 0; + break; + } } static struct signature_element *find_signature_element(const struct shader_signature *signature,

1 0

Giovanni Mascellani : vkd3d-shader/ir: Validate SSA registers.
by Alexandre Julliard Jan. 4, 2024

Jan. 4, 2024

Module: vkd3d Branch: master Commit: e91da41dea66ddc1aa21980ee9c8858a55ec5825 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e91da41dea66ddc1aa21980ee9c88… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Dec 21 15:54:13 2023 +0100 vkd3d-shader/ir: Validate SSA registers. --- libs/vkd3d-shader/ir.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index c6ac0da0..a21af2fe 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -1604,6 +1604,19 @@ static void vsir_validate_register(struct validation_context *ctx, reg->idx[0].offset, temp_count); break; + case VKD3DSPR_SSA: + if (reg->idx_count != 1) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX_COUNT, "Invalid index count %u for a SSA register.", + reg->idx_count); + + if (reg->idx_count >= 1 && reg->idx[0].rel_addr) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX, "Non-NULL relative address for a SSA register."); + + if (reg->idx_count >= 1 && reg->idx[0].offset >= ctx->parser->shader_desc.ssa_count) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX, "SSA register index %u exceeds the maximum count %u.", + reg->idx[0].offset, ctx->parser->shader_desc.ssa_count); + break; + case VKD3DSPR_NULL: if (reg->idx_count != 0) validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX_COUNT, "Invalid index count %u for a NULL register.",

1 0

Eric Pouech : winedbg: Wait for gdb to terminate before exiting (proxy mode).
by Alexandre Julliard Jan. 4, 2024

Jan. 4, 2024

Module: wine Branch: master Commit: b12c1eaea6f1bd98a03eeed9b84701df5eb7b20c URL: https://gitlab.winehq.org/wine/wine/-/commit/b12c1eaea6f1bd98a03eeed9b84701… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sat Dec 16 09:32:51 2023 +0100 winedbg: Wait for gdb to terminate before exiting (proxy mode). This mainly allows Wine to reset the tty settings upon termination and not let gdb do it (cf bug report). Change: user is now required to explicitely terminate gdb ('quit' command) upon debuggee termination. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56032 Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/winedbg/gdbproxy.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 238eecb1538..0d400711d34 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -64,6 +64,7 @@ struct reply_buffer struct gdb_context { /* gdb information */ + HANDLE gdb_ctrl_thread; SOCKET sock; /* incoming buffer */ char* in_buf; @@ -2391,21 +2392,28 @@ static int fetch_data(struct gdb_context* gdbctx) return gdbctx->in_len - in_len; } +static DWORD WINAPI gdb_ctrl_thread(void *pmt) +{ + /* don't bother freeing passed memory, we're terminating anyway */ + return __wine_unix_spawnvp( (char **)pmt, TRUE ); +} + #define FLAG_NO_START 1 #define FLAG_WITH_XTERM 2 -static BOOL gdb_exec(unsigned port, unsigned flags) +static HANDLE gdb_exec(unsigned port, unsigned flags) { WCHAR tmp[MAX_PATH], buf[MAX_PATH]; - const char *argv[6]; + const char **argv; char *unix_tmp; const char *gdb_path; FILE* f; + if (!(argv = HeapAlloc( GetProcessHeap(), 0, 6 * sizeof(argv[0]) ))) return NULL; if (!(gdb_path = getenv("WINE_GDB"))) gdb_path = "gdb"; GetTempPathW( MAX_PATH, buf ); GetTempFileNameW( buf, L"gdb", 0, tmp ); - if ((f = _wfopen( tmp, L"w+" )) == NULL) return FALSE; + if ((f = _wfopen( tmp, L"w+" )) == NULL) return NULL; unix_tmp = wine_get_unix_file_name( tmp ); fprintf(f, "target remote localhost:%d\n", ntohs(port)); fprintf(f, "set prompt Wine-gdb>\\ \n"); @@ -2428,12 +2436,7 @@ static BOOL gdb_exec(unsigned port, unsigned flags) argv[3] = "-x"; argv[4] = unix_tmp; argv[5] = NULL; - if (flags & FLAG_WITH_XTERM) - __wine_unix_spawnvp( (char **)argv, FALSE ); - else - __wine_unix_spawnvp( (char **)argv + 2, FALSE ); - HeapFree( GetProcessHeap(), 0, unix_tmp ); - return TRUE; + return CreateThread( NULL, 0, gdb_ctrl_thread, (char **)argv + ((flags & FLAG_WITH_XTERM) ? 0 : 2), 0, NULL ); } static BOOL gdb_startup(struct gdb_context* gdbctx, unsigned flags, unsigned port) @@ -2473,7 +2476,7 @@ static BOOL gdb_startup(struct gdb_context* gdbctx, unsigned flags, unsigned por if (flags & FLAG_NO_START) fprintf(stderr, "target remote localhost:%d\n", ntohs(s_addrs.sin_port)); else - gdb_exec(s_addrs.sin_port, flags); + gdbctx->gdb_ctrl_thread = gdb_exec(s_addrs.sin_port, flags); /* step 4: wait for gdb to connect actually */ FD_ZERO( &read_fds ); @@ -2505,6 +2508,7 @@ static BOOL gdb_init_context(struct gdb_context* gdbctx, unsigned flags, unsigne { int i; + gdbctx->gdb_ctrl_thread = NULL; gdbctx->sock = INVALID_SOCKET; gdbctx->in_buf = NULL; gdbctx->in_buf_alloc = 0; @@ -2575,6 +2579,8 @@ static int gdb_remote(unsigned flags, unsigned port) } } } + /* wait for gdb to terminate */ + WaitForSingleObject(gdbctx.gdb_ctrl_thread, INFINITE); return 0; }

1 0

Zebediah Figura : vkd3d-shader/d3dbc: Assign unique register indices for VKD3DSPR_RASTOUT.
by Alexandre Julliard Jan. 4, 2024

Jan. 4, 2024

Module: vkd3d Branch: master Commit: 1ce7e3d8b1e675f6195d05f60eb0c2cefe8c8939 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1ce7e3d8b1e675f6195d05f60eb0c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Oct 27 12:44:38 2023 -0500 vkd3d-shader/d3dbc: Assign unique register indices for VKD3DSPR_RASTOUT. --- libs/vkd3d-shader/d3dbc.c | 6 +++--- libs/vkd3d-shader/ir.c | 2 +- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + tests/vkd3d_shader_api.c | 10 +++++----- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index ce731634..67f9e280 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -645,15 +645,15 @@ static bool add_signature_element_from_register(struct vkd3d_shader_sm1_parser * { case 0: return add_signature_element(sm1, true, "POSITION", 0, - VKD3D_SHADER_SV_POSITION, register_index, is_dcl, mask); + VKD3D_SHADER_SV_POSITION, SM1_RASTOUT_REGISTER_OFFSET + register_index, is_dcl, mask); case 1: return add_signature_element(sm1, true, "FOG", 0, - VKD3D_SHADER_SV_NONE, register_index, is_dcl, 0x1); + VKD3D_SHADER_SV_NONE, SM1_RASTOUT_REGISTER_OFFSET + register_index, is_dcl, 0x1); case 2: return add_signature_element(sm1, true, "PSIZE", 0, - VKD3D_SHADER_SV_NONE, register_index, is_dcl, 0x1); + VKD3D_SHADER_SV_NONE, SM1_RASTOUT_REGISTER_OFFSET + register_index, is_dcl, 0x1); default: vkd3d_shader_parser_error(&sm1->p, VKD3D_SHADER_ERROR_D3DBC_INVALID_REGISTER_INDEX, diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 01325197..c6ac0da0 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -916,7 +916,7 @@ static bool shader_dst_param_io_normalise(struct vkd3d_shader_dst_param *dst_par break; case VKD3DSPR_RASTOUT: - reg_idx = reg->idx[0].offset; + reg_idx = SM1_RASTOUT_REGISTER_OFFSET + reg->idx[0].offset; signature = normaliser->output_signature; reg->type = VKD3DSPR_OUTPUT; dcl_params = normaliser->output_dcl_params; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 58bed96d..b9fd3cb1 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -956,6 +956,7 @@ enum vkd3d_shader_input_sysval_semantic }; #define SM1_COLOR_REGISTER_OFFSET 8 +#define SM1_RASTOUT_REGISTER_OFFSET 10 #define SIGNATURE_TARGET_LOCATION_UNUSED (~0u) diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index 61c412c5..018506a4 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -523,11 +523,11 @@ static void test_scan_signatures(void) static const struct vkd3d_shader_signature_element vs3_outputs[] = { - {"POSITION", 0, 0, VKD3D_SHADER_SV_POSITION, VKD3D_SHADER_COMPONENT_FLOAT, 0, 0xf, 0xf}, - {"TEXCOORD", 2, 0, VKD3D_SHADER_SV_NONE, VKD3D_SHADER_COMPONENT_FLOAT, 2, 0xf, 0xf}, - {"COLOR", 0, 0, VKD3D_SHADER_SV_NONE, VKD3D_SHADER_COMPONENT_FLOAT, 8, 0xf, 0xf}, - {"FOG", 0, 0, VKD3D_SHADER_SV_NONE, VKD3D_SHADER_COMPONENT_FLOAT, 1, 0x1, 0x1}, - {"PSIZE", 0, 0, VKD3D_SHADER_SV_NONE, VKD3D_SHADER_COMPONENT_FLOAT, 2, 0x1, 0x1}, + {"POSITION", 0, 0, VKD3D_SHADER_SV_POSITION, VKD3D_SHADER_COMPONENT_FLOAT, 10, 0xf, 0xf}, + {"TEXCOORD", 2, 0, VKD3D_SHADER_SV_NONE, VKD3D_SHADER_COMPONENT_FLOAT, 2, 0xf, 0xf}, + {"COLOR", 0, 0, VKD3D_SHADER_SV_NONE, VKD3D_SHADER_COMPONENT_FLOAT, 8, 0xf, 0xf}, + {"FOG", 0, 0, VKD3D_SHADER_SV_NONE, VKD3D_SHADER_COMPONENT_FLOAT, 11, 0x1, 0x1}, + {"PSIZE", 0, 0, VKD3D_SHADER_SV_NONE, VKD3D_SHADER_COMPONENT_FLOAT, 12, 0x1, 0x1}, }; static const char vs4_source[] =

1 0