January 2024 - Wine-commits

Giovanni Mascellani : vkd3d-shader/ir: Validate BRANCH instructions.
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: vkd3d Branch: master Commit: 46ebb404d76d7c5b314880ede1e8549e70fd20ae URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/46ebb404d76d7c5b314880ede1e85… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Dec 22 17:11:41 2023 +0100 vkd3d-shader/ir: Validate BRANCH instructions. --- libs/vkd3d-shader/ir.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index a4bea461..ed53ece2 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -2650,6 +2650,34 @@ static void vsir_validate_src_count(struct validation_context *ctx, instruction->src_count, instruction->handler_idx, count); } +static bool vsir_validate_src_min_count(struct validation_context *ctx, + const struct vkd3d_shader_instruction *instruction, unsigned int count) +{ + if (instruction->src_count < count) + { + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_SOURCE_COUNT, + "Invalid source count %u for an instruction of type %#x, expected at least %u.", + instruction->src_count, instruction->handler_idx, count); + return false; + } + + return true; +} + +static bool vsir_validate_src_max_count(struct validation_context *ctx, + const struct vkd3d_shader_instruction *instruction, unsigned int count) +{ + if (instruction->src_count > count) + { + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_SOURCE_COUNT, + "Invalid source count %u for an instruction of type %#x, expected at most %u.", + instruction->src_count, instruction->handler_idx, count); + return false; + } + + return true; +} + static const char *name_from_cf_type(enum cf_type type) { switch (type) @@ -2856,6 +2884,43 @@ static void vsir_validate_instruction(struct validation_context *ctx) instruction->src[0].reg.type); break; + case VKD3DSIH_BRANCH: + vsir_validate_cf_type(ctx, instruction, CF_TYPE_BLOCKS); + vsir_validate_dst_count(ctx, instruction, 0); + if (!vsir_validate_src_min_count(ctx, instruction, 1)) + break; + if (vsir_register_is_label(&instruction->src[0].reg)) + { + /* Unconditional branch: parameters are jump label, + * optional merge label, optional continue label. */ + vsir_validate_src_max_count(ctx, instruction, 3); + + for (i = 0; i < instruction->src_count; ++i) + { + if (!vsir_register_is_label(&instruction->src[i].reg)) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_REGISTER_TYPE, + "Invalid register of type %#x in unconditional BRANCH instruction, expected LABEL.", + instruction->src[i].reg.type); + } + } + else + { + /* Conditional branch: parameters are condition, true + * jump label, false jump label, optional merge label, + * optional continue label. */ + vsir_validate_src_min_count(ctx, instruction, 3); + vsir_validate_src_max_count(ctx, instruction, 5); + + for (i = 1; i < instruction->src_count; ++i) + { + if (!vsir_register_is_label(&instruction->src[i].reg)) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_REGISTER_TYPE, + "Invalid register of type %#x in conditional BRANCH instruction, expected LABEL.", + instruction->src[i].reg.type); + } + } + break; + default: break; }

1 0

Giovanni Mascellani : vkd3d-shader/ir: Validate SWITCH_MONOLITHIC instructions.
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: vkd3d Branch: master Commit: af967302766b193157843069f566935bb5f27c97 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/af967302766b193157843069f5669… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jan 12 10:50:30 2024 +0100 vkd3d-shader/ir: Validate SWITCH_MONOLITHIC instructions. --- libs/vkd3d-shader/ir.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index ed53ece2..c009fd90 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -2921,6 +2921,51 @@ static void vsir_validate_instruction(struct validation_context *ctx) } break; + case VKD3DSIH_SWITCH_MONOLITHIC: + { + unsigned int case_count; + + vsir_validate_cf_type(ctx, instruction, CF_TYPE_BLOCKS); + vsir_validate_dst_count(ctx, instruction, 0); + /* Parameters are source, default label, merge label and + * then pairs of constant value and case label. */ + if (!vsir_validate_src_min_count(ctx, instruction, 3)) + break; + if (instruction->src_count % 2 != 1) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_SOURCE_COUNT, + "Invalid source count %u for a monolithic SWITCH instruction, it must be an odd number.", + instruction->src_count); + + if (!vsir_register_is_label(&instruction->src[1].reg)) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_REGISTER_TYPE, + "Invalid default label register of type %#x in monolithic SWITCH instruction, expected LABEL.", + instruction->src[1].reg.type); + + if (!vsir_register_is_label(&instruction->src[2].reg)) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_REGISTER_TYPE, + "Invalid merge label register of type %#x in monolithic SWITCH instruction, expected LABEL.", + instruction->src[2].reg.type); + + case_count = (instruction->src_count - 3) / 2; + + for (i = 0; i < case_count; ++i) + { + unsigned int value_idx = 3 + 2 * i; + unsigned int label_idx = 3 + 2 * i + 1; + + if (!register_is_constant(&instruction->src[value_idx].reg)) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_REGISTER_TYPE, + "Invalid value register for case %zu of type %#x in monolithic SWITCH instruction, " + "expected IMMCONST or IMMCONST64.", i, instruction->src[value_idx].reg.type); + + if (!vsir_register_is_label(&instruction->src[label_idx].reg)) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_REGISTER_TYPE, + "Invalid label register for case %zu of type %#x in monolithic SWITCH instruction, " + "expected LABEL.", i, instruction->src[value_idx].reg.type); + } + break; + } + default: break; }

1 0

Giovanni Mascellani : vkd3d-shader/ir: Validate RET instructions.
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: vkd3d Branch: master Commit: 67902d4304dc12cd187b679125efbcd69fcda64a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/67902d4304dc12cd187b679125efb… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jan 12 11:10:22 2024 +0100 vkd3d-shader/ir: Validate RET instructions. --- libs/vkd3d-shader/ir.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index c009fd90..14288a38 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -2874,6 +2874,11 @@ static void vsir_validate_instruction(struct validation_context *ctx) --ctx->depth; break; + case VKD3DSIH_RET: + vsir_validate_dst_count(ctx, instruction, 0); + vsir_validate_src_count(ctx, instruction, 0); + break; + case VKD3DSIH_LABEL: vsir_validate_cf_type(ctx, instruction, CF_TYPE_BLOCKS); vsir_validate_dst_count(ctx, instruction, 0);

1 0

Henri Verbeet : vkd3d-shader/d3dbc: Store the "offset" field as an unsigned int in hlsl_sm1_register_from_semantic().
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: vkd3d Branch: master Commit: f69c8b1cc4e1e0e81f16dd533ce7af81c61f7dab URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f69c8b1cc4e1e0e81f16dd533ce7a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 10 22:56:57 2024 +0100 vkd3d-shader/d3dbc: Store the "offset" field as an unsigned int in hlsl_sm1_register_from_semantic(). --- libs/vkd3d-shader/d3dbc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index dcd51035..a2dd358b 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -1389,7 +1389,7 @@ bool hlsl_sm1_register_from_semantic(struct hlsl_ctx *ctx, const struct hlsl_sem enum vkd3d_shader_type shader_type; unsigned int major_version; D3DSHADER_PARAM_REGISTER_TYPE type; - DWORD offset; + unsigned int offset; } register_table[] = {

1 0

Henri Verbeet : vkd3d-common: Introduce vkd3d_atomic_increment_u32().
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: vkd3d Branch: master Commit: 03fbf4a3dc45a022ee0c3bcd3069813cf0968963 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/03fbf4a3dc45a022ee0c3bcd30698… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 18 19:50:00 2024 +0100 vkd3d-common: Introduce vkd3d_atomic_increment_u32(). --- include/private/vkd3d_common.h | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index f01c7125..6c8f8eed 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -278,20 +278,32 @@ static inline uint64_t vkd3d_atomic_add_fetch_u64(uint64_t volatile *x, uint64_t #endif } +static inline uint32_t vkd3d_atomic_add_fetch_u32(uint32_t volatile *x, uint32_t val) +{ +#if HAVE_SYNC_ADD_AND_FETCH + return __sync_add_and_fetch(x, val); +#elif defined(_WIN32) + return InterlockedAdd((LONG *)x, val); +#else +# error "vkd3d_atomic_add_fetch_u32() not implemented for this platform" +#endif +} + static inline uint64_t vkd3d_atomic_increment_u64(uint64_t volatile *x) { return vkd3d_atomic_add_fetch_u64(x, 1); } +static inline uint32_t vkd3d_atomic_increment_u32(uint32_t volatile *x) +{ + return vkd3d_atomic_add_fetch_u32(x, 1); +} + #ifndef _WIN32 -# if HAVE_SYNC_ADD_AND_FETCH static inline LONG InterlockedIncrement(LONG volatile *x) { - return __sync_add_and_fetch(x, 1); + return vkd3d_atomic_increment_u32((uint32_t *)x); } -# else -# error "InterlockedIncrement() not implemented for this platform" -# endif /* HAVE_SYNC_ADD_AND_FETCH */ # if HAVE_SYNC_SUB_AND_FETCH static inline LONG InterlockedDecrement(LONG volatile *x)

1 0

Henri Verbeet : vkd3d-common: Use vkd3d_atomic_increment_u32() in get_buffer().
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: vkd3d Branch: master Commit: 5fe3c624d50b5a01badd70772cfe8fb24fab7157 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5fe3c624d50b5a01badd70772cfe8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 18 19:50:00 2024 +0100 vkd3d-common: Use vkd3d_atomic_increment_u32() in get_buffer(). --- libs/vkd3d-common/debug.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-common/debug.c b/libs/vkd3d-common/debug.c index aa7df5bd..e12cd394 100644 --- a/libs/vkd3d-common/debug.c +++ b/libs/vkd3d-common/debug.c @@ -126,10 +126,10 @@ void vkd3d_dbg_set_log_callback(PFN_vkd3d_log callback) static char *get_buffer(void) { static char buffers[VKD3D_DEBUG_BUFFER_COUNT][VKD3D_DEBUG_BUFFER_SIZE]; - static LONG buffer_index; - LONG current_index; + static unsigned int buffer_index; + unsigned int current_index; - current_index = InterlockedIncrement(&buffer_index) % ARRAY_SIZE(buffers); + current_index = vkd3d_atomic_increment_u32(&buffer_index) % ARRAY_SIZE(buffers); return buffers[current_index]; }

1 0

Henri Verbeet : vkd3d-common: Use vkd3d_atomic_increment_u32() in vkd3d_blob_AddRef().
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: vkd3d Branch: master Commit: bb6b393c15a20d6963e9e6cd5376499157a5429d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/bb6b393c15a20d6963e9e6cd53764… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 18 19:50:00 2024 +0100 vkd3d-common: Use vkd3d_atomic_increment_u32() in vkd3d_blob_AddRef(). --- libs/vkd3d-common/blob.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-common/blob.c b/libs/vkd3d-common/blob.c index 0f6d5a5e..0e178d12 100644 --- a/libs/vkd3d-common/blob.c +++ b/libs/vkd3d-common/blob.c @@ -27,7 +27,7 @@ struct vkd3d_blob { ID3D10Blob ID3DBlob_iface; - LONG refcount; + unsigned int refcount; void *buffer; SIZE_T size; @@ -59,7 +59,7 @@ static HRESULT STDMETHODCALLTYPE vkd3d_blob_QueryInterface(ID3DBlob *iface, REFI static ULONG STDMETHODCALLTYPE vkd3d_blob_AddRef(ID3DBlob *iface) { struct vkd3d_blob *blob = impl_from_ID3DBlob(iface); - ULONG refcount = InterlockedIncrement(&blob->refcount); + unsigned int refcount = vkd3d_atomic_increment_u32(&blob->refcount); TRACE("%p increasing refcount to %u.\n", blob, refcount); @@ -69,7 +69,7 @@ static ULONG STDMETHODCALLTYPE vkd3d_blob_AddRef(ID3DBlob *iface) static ULONG STDMETHODCALLTYPE vkd3d_blob_Release(ID3DBlob *iface) { struct vkd3d_blob *blob = impl_from_ID3DBlob(iface); - ULONG refcount = InterlockedDecrement(&blob->refcount); + ULONG refcount = InterlockedDecrement((LONG *)&blob->refcount); TRACE("%p decreasing refcount to %u.\n", blob, refcount);

1 0

Henri Verbeet : vkd3d-common: Introduce vkd3d_atomic_decrement_u32().
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: vkd3d Branch: master Commit: 9228e131557c78119951ee423deb260d3262e01b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9228e131557c78119951ee423deb2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 18 19:50:00 2024 +0100 vkd3d-common: Introduce vkd3d_atomic_decrement_u32(). --- include/private/vkd3d_common.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index 6c8f8eed..46090eac 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -294,6 +294,11 @@ static inline uint64_t vkd3d_atomic_increment_u64(uint64_t volatile *x) return vkd3d_atomic_add_fetch_u64(x, 1); } +static inline uint32_t vkd3d_atomic_decrement_u32(uint32_t volatile *x) +{ + return vkd3d_atomic_add_fetch_u32(x, ~0u); +} + static inline uint32_t vkd3d_atomic_increment_u32(uint32_t volatile *x) { return vkd3d_atomic_add_fetch_u32(x, 1); @@ -305,15 +310,10 @@ static inline LONG InterlockedIncrement(LONG volatile *x) return vkd3d_atomic_increment_u32((uint32_t *)x); } -# if HAVE_SYNC_SUB_AND_FETCH static inline LONG InterlockedDecrement(LONG volatile *x) { - return __sync_sub_and_fetch(x, 1); + return vkd3d_atomic_decrement_u32((uint32_t *)x); } -# else -# error "InterlockedDecrement() not implemented for this platform" -# endif - #endif /* _WIN32 */ static inline void vkd3d_parse_version(const char *version, int *major, int *minor)

1 0

Henri Verbeet : vkd3d-common: Use vkd3d_atomic_decrement_u32() in vkd3d_blob_Release().
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: vkd3d Branch: master Commit: 14da4df99e4af78e4c4668fc3a693b61a9c818ab URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/14da4df99e4af78e4c4668fc3a693… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 18 19:50:00 2024 +0100 vkd3d-common: Use vkd3d_atomic_decrement_u32() in vkd3d_blob_Release(). --- libs/vkd3d-common/blob.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-common/blob.c b/libs/vkd3d-common/blob.c index 0e178d12..6c893b89 100644 --- a/libs/vkd3d-common/blob.c +++ b/libs/vkd3d-common/blob.c @@ -69,7 +69,7 @@ static ULONG STDMETHODCALLTYPE vkd3d_blob_AddRef(ID3DBlob *iface) static ULONG STDMETHODCALLTYPE vkd3d_blob_Release(ID3DBlob *iface) { struct vkd3d_blob *blob = impl_from_ID3DBlob(iface); - ULONG refcount = InterlockedDecrement((LONG *)&blob->refcount); + unsigned int refcount = vkd3d_atomic_decrement_u32(&blob->refcount); TRACE("%p decreasing refcount to %u.\n", blob, refcount);

1 0

Conor McCarthy : vkd3d-shader/dxil: Introduce a code block terminator struct.
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: vkd3d Branch: master Commit: 9e964fa0c74e79a95e92e901a61b3f31f06e395b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9e964fa0c74e79a95e92e901a61b3… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Nov 23 14:10:57 2023 +1000 vkd3d-shader/dxil: Introduce a code block terminator struct. --- libs/vkd3d-shader/dxil.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 78c1a052..41e5b4be 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -472,11 +472,23 @@ struct sm6_symbol const char *name; }; +enum sm6_block_terminator_type +{ + TERMINATOR_RET, +}; + +struct sm6_block_terminator +{ + enum sm6_block_terminator_type type; +}; + struct sm6_block { struct vkd3d_shader_instruction *instructions; size_t instruction_capacity; size_t instruction_count; + + struct sm6_block_terminator terminator; }; struct sm6_function @@ -4297,6 +4309,8 @@ static void sm6_parser_emit_ret(struct sm6_parser *sm6, const struct dxil_record if (record->operand_count) FIXME("Non-void return is not implemented.\n"); + code_block->terminator.type = TERMINATOR_RET; + ins->handler_idx = VKD3DSIH_NOP; } @@ -4797,6 +4811,19 @@ static enum vkd3d_result sm6_parser_function_init(struct sm6_parser *sm6, const return VKD3D_OK; } +static void sm6_block_emit_terminator(const struct sm6_block *block, struct sm6_parser *sm6) +{ + switch (block->terminator.type) + { + case TERMINATOR_RET: + sm6_parser_add_instruction(sm6, VKD3DSIH_RET); + break; + + default: + vkd3d_unreachable(); + } +} + static bool sm6_block_emit_instructions(struct sm6_block *block, struct sm6_parser *sm6) { struct vkd3d_shader_instruction *ins = sm6_parser_require_space(sm6, block->instruction_count + 1); @@ -4807,7 +4834,7 @@ static bool sm6_block_emit_instructions(struct sm6_block *block, struct sm6_pars memcpy(ins, block->instructions, block->instruction_count * sizeof(*block->instructions)); sm6->p.instructions.count += block->instruction_count; - sm6_parser_add_instruction(sm6, VKD3DSIH_RET); + sm6_block_emit_terminator(block, sm6); return true; }

1 0