November 2022 - Wine-commits

Zebediah Figura : vkd3d-shader/hlsl: Parse the numthreads attribute.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: vkd3d Branch: master Commit: 718c79b82331ad09c9407969134c3c5a6944c7d8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/718c79b82331ad09c9407969134c3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 16 17:29:34 2021 -0500 vkd3d-shader/hlsl: Parse the numthreads attribute. --- libs/vkd3d-shader/hlsl.h | 3 ++ libs/vkd3d-shader/hlsl_codegen.c | 68 ++++++++++++++++++++++++++++++-- libs/vkd3d-shader/vkd3d_shader_private.h | 2 + 3 files changed, 69 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index c7a19302..b6a593ca 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -537,7 +537,10 @@ struct hlsl_ctx } constant_defs; uint32_t temp_count; + uint32_t thread_count[3]; + uint32_t in_state_block : 1; + uint32_t found_numthreads : 1; }; enum hlsl_error_level diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 0df870cc..27af49cf 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -2534,9 +2534,58 @@ struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_dere return ret; } +static void parse_numthreads_attribute(struct hlsl_ctx *ctx, const struct hlsl_attribute *attr) +{ + unsigned int i; + + ctx->found_numthreads = 1; + + if (attr->args_count != 3) + { + hlsl_error(ctx, &attr->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Expected 3 parameters for [numthreads] attribute, but got %u.", attr->args_count); + return; + } + + for (i = 0; i < attr->args_count; ++i) + { + const struct hlsl_ir_node *instr = attr->args[i].node; + const struct hlsl_type *type = instr->data_type; + const struct hlsl_ir_constant *constant; + + if (type->type != HLSL_CLASS_SCALAR + || (type->base_type != HLSL_TYPE_INT && type->base_type != HLSL_TYPE_UINT)) + { + struct vkd3d_string_buffer *string; + + if ((string = hlsl_type_to_string(ctx, type))) + hlsl_error(ctx, &instr->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Wrong type for argument %u of [numthreads]: expected int or uint, but got %s.", + i, string->buffer); + hlsl_release_string_buffer(ctx, string); + break; + } + + if (instr->type != HLSL_IR_CONSTANT) + { + hlsl_fixme(ctx, &instr->loc, "Non-constant expression in [numthreads] initializer."); + break; + } + constant = hlsl_ir_constant(instr); + + if ((type->base_type == HLSL_TYPE_INT && constant->value[0].i <= 0) + || (type->base_type == HLSL_TYPE_UINT && !constant->value[0].u)) + hlsl_error(ctx, &instr->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_THREAD_COUNT, + "Thread count must be a positive integer."); + + ctx->thread_count[i] = constant->value[0].u; + } +} + int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, enum vkd3d_shader_target_type target_type, struct vkd3d_shader_code *out) { + const struct hlsl_profile_info *profile = ctx->profile; struct hlsl_block *const body = &entry_func->body; struct hlsl_ir_var *var; unsigned int i; @@ -2578,8 +2627,19 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry } for (i = 0; i < entry_func->attr_count; ++i) - hlsl_warning(ctx, &entry_func->attrs[i]->loc, VKD3D_SHADER_WARNING_HLSL_UNKNOWN_ATTRIBUTE, - "Ignoring unknown attribute \"%s\".", entry_func->attrs[i]->name); + { + const struct hlsl_attribute *attr = entry_func->attrs[i]; + + if (!strcmp(attr->name, "numthreads") && profile->type == VKD3D_SHADER_TYPE_COMPUTE) + parse_numthreads_attribute(ctx, attr); + else + hlsl_warning(ctx, &entry_func->attrs[i]->loc, VKD3D_SHADER_WARNING_HLSL_UNKNOWN_ATTRIBUTE, + "Ignoring unknown attribute \"%s\".", entry_func->attrs[i]->name); + } + + if (profile->type == VKD3D_SHADER_TYPE_COMPUTE && !ctx->found_numthreads) + hlsl_error(ctx, &entry_func->loc, VKD3D_SHADER_ERROR_HLSL_MISSING_ATTRIBUTE, + "Entry point \"%s\" is missing a [numthreads] attribute.", entry_func->func->name); transform_ir(ctx, lower_broadcasts, body, NULL); while (transform_ir(ctx, fold_redundant_casts, body, NULL)); @@ -2606,7 +2666,7 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry } while (progress); - if (ctx->profile->major_version < 4) + if (profile->major_version < 4) transform_ir(ctx, lower_division, body, NULL); transform_ir(ctx, validate_static_object_references, body, NULL); @@ -2625,7 +2685,7 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry rb_for_each_entry(&ctx->functions, dump_function, ctx); allocate_temp_registers(ctx, entry_func); - if (ctx->profile->major_version < 4) + if (profile->major_version < 4) { allocate_const_registers(ctx, entry_func); } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index aae7cea1..74edf049 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -119,6 +119,8 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_HLSL_INCOMPATIBLE_PROFILE = 5020, VKD3D_SHADER_ERROR_HLSL_DIVISION_BY_ZERO = 5021, VKD3D_SHADER_ERROR_HLSL_NON_STATIC_OBJECT_REF = 5022, + VKD3D_SHADER_ERROR_HLSL_INVALID_THREAD_COUNT = 5023, + VKD3D_SHADER_ERROR_HLSL_MISSING_ATTRIBUTE = 5024, VKD3D_SHADER_WARNING_HLSL_IMPLICIT_TRUNCATION = 5300, VKD3D_SHADER_WARNING_HLSL_DIVISION_BY_ZERO = 5301,

1 0

Zebediah Figura : vkd3d-shader/hlsl: Write SM4 dcl_thread_group instructions.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: vkd3d Branch: master Commit: 3857ca06facc3313e6a107cbd6a9df58a25b118d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3857ca06facc3313e6a107cbd6a9d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 16 17:49:09 2021 -0500 vkd3d-shader/hlsl: Write SM4 dcl_thread_group instructions. --- libs/vkd3d-shader/hlsl.c | 7 ------- libs/vkd3d-shader/hlsl_sm4.c | 18 +++++++++++++++++- tests/compute.shader_test | 6 +++--- tests/hlsl-numthreads.shader_test | 28 ++++++++++++++-------------- tests/uav-load.shader_test | 4 ++-- 5 files changed, 36 insertions(+), 27 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 310560b2..eddbf2c8 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -2587,13 +2587,6 @@ int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d return VKD3D_ERROR_INVALID_SHADER; } - if (profile->type == VKD3D_SHADER_TYPE_COMPUTE) - { - const struct vkd3d_shader_location loc = {.source_name = compile_info->source_name}; - - hlsl_fixme(&ctx, &loc, "Compute shader thread count.\n"); - } - ret = hlsl_emit_bytecode(&ctx, entry_func, compile_info->target_type, out); hlsl_ctx_cleanup(&ctx); diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index d3e1cbfa..ae5bb1ac 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -833,7 +833,7 @@ struct sm4_instruction } srcs[4]; unsigned int src_count; - uint32_t idx[2]; + uint32_t idx[3]; unsigned int idx_count; }; @@ -1278,6 +1278,19 @@ static void write_sm4_dcl_temps(struct vkd3d_bytecode_buffer *buffer, uint32_t t write_sm4_instruction(buffer, &instr); } +static void write_sm4_dcl_thread_group(struct vkd3d_bytecode_buffer *buffer, const uint32_t thread_count[3]) +{ + struct sm4_instruction instr = + { + .opcode = VKD3D_SM5_OP_DCL_THREAD_GROUP, + + .idx = {thread_count[0], thread_count[1], thread_count[2]}, + .idx_count = 3, + }; + + write_sm4_instruction(buffer, &instr); +} + static void write_sm4_ret(struct vkd3d_bytecode_buffer *buffer) { struct sm4_instruction instr = @@ -2370,6 +2383,9 @@ static void write_sm4_shdr(struct hlsl_ctx *ctx, write_sm4_dcl_semantic(ctx, &buffer, var); } + if (profile->type == VKD3D_SHADER_TYPE_COMPUTE) + write_sm4_dcl_thread_group(&buffer, ctx->thread_count); + if (ctx->temp_count) write_sm4_dcl_temps(&buffer, ctx->temp_count); diff --git a/tests/compute.shader_test b/tests/compute.shader_test index f5f5920f..6d2f698c 100644 --- a/tests/compute.shader_test +++ b/tests/compute.shader_test @@ -7,7 +7,7 @@ size (1, 1) 0.1 -[compute shader todo] +[compute shader] RWTexture2D<float> u; [numthreads(1, 1, 1)] @@ -17,5 +17,5 @@ void main() } [test] -todo dispatch 1 1 1 -todo probe uav 0 (0, 0) r (-123.0) +dispatch 1 1 1 +probe uav 0 (0, 0) r (-123.0) diff --git a/tests/hlsl-numthreads.shader_test b/tests/hlsl-numthreads.shader_test index 3e3973b3..328be664 100644 --- a/tests/hlsl-numthreads.shader_test +++ b/tests/hlsl-numthreads.shader_test @@ -3,37 +3,37 @@ [require] shader model >= 5.0 -[compute shader todo] +[compute shader] [numthreads(1, 1, 1)] void main() {} -[compute shader fail todo] +[compute shader fail] [numthreads] void main() {} -[compute shader fail todo] +[compute shader fail] [numthreads(1, 1)] void main() {} -[compute shader fail todo] +[compute shader fail] [numthreads(1, 1, 1, 1)] void main() {} -[compute shader fail todo] +[compute shader fail] [numthreads(0, 1, 1)] void main() {} -[compute shader fail todo] +[compute shader fail] [numthreads(1, 0, 1)] void main() {} -[compute shader fail todo] +[compute shader fail] [numthreads(1, 1, 0)] void main() {} @@ -68,12 +68,12 @@ void main() {} [numthreads(int(1), 1, 1)] void main() {} -[compute shader fail todo] +[compute shader fail] [numthreads(float(1), 1, 1)] void main() {} -[compute shader fail todo] +[compute shader fail] [numthreads(uint1(1), 1, 1)] void main() {} @@ -99,30 +99,30 @@ static int x = 1; [numthreads(x, 1, 1)] void main() {} -[compute shader fail todo] +[compute shader fail] void main() {} -[compute shader fail todo] +[compute shader fail] [NumThreads(1, 1, 1)] void main() {} -[compute shader todo] +[compute shader] [numthreads(1, 1, 1)] void main(); void main() {} -[compute shader fail todo] +[compute shader fail] void main() {} [numthreads(1, 1, 1)] void main(); -[compute shader fail todo] +[compute shader fail] void main(); diff --git a/tests/uav-load.shader_test b/tests/uav-load.shader_test index 0f622f2b..fe6350e0 100644 --- a/tests/uav-load.shader_test +++ b/tests/uav-load.shader_test @@ -13,7 +13,7 @@ size (1, 1) 0.5 -[compute shader todo] +[compute shader] RWTexture2D<float> u, v; [numthreads(1, 1, 1)] void main() @@ -23,7 +23,7 @@ void main() } [test] -todo dispatch 1 1 1 +dispatch 1 1 1 probe uav 0 (0, 0) r (0.6) probe uav 0 (1, 0) r (0.6) probe uav 0 (2, 0) r (0.6)

1 0

Zebediah Figura : vkd3d-common: Always prefix debug output with "vkd3d".
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: vkd3d Branch: master Commit: 58c7c4b8064f4db7d6dc982cf08aa47d986a6913 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/58c7c4b8064f4db7d6dc982cf08aa… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Nov 4 17:53:18 2022 -0500 vkd3d-common: Always prefix debug output with "vkd3d". Make it clear which library the debug output is coming from, without relying on the function name including "vkd3d". --- libs/vkd3d-common/debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-common/debug.c b/libs/vkd3d-common/debug.c index e07ed366..499334a3 100644 --- a/libs/vkd3d-common/debug.c +++ b/libs/vkd3d-common/debug.c @@ -105,7 +105,7 @@ void vkd3d_dbg_printf(enum vkd3d_dbg_level level, const char *function, const ch assert(level < ARRAY_SIZE(debug_level_names)); - vkd3d_dbg_output("%s:%s ", debug_level_names[level], function); + vkd3d_dbg_output("vkd3d:%s:%s ", debug_level_names[level], function); va_start(args, fmt); vkd3d_dbg_voutput(fmt, args); va_end(args);

1 0

Zebediah Figura : vkd3d-shader/spirv: Rename struct vkd3d_dxbc_compiler to struct spirv_compiler.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: vkd3d Branch: master Commit: 35b48a8b041e59e3b35d3ac67f27b4e3d648c898 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/35b48a8b041e59e3b35d3ac67f27b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Mar 12 15:37:33 2022 -0600 vkd3d-shader/spirv: Rename struct vkd3d_dxbc_compiler to struct spirv_compiler. We would like to generate SPIR-V for input formats other than DXBC. The "vkd3d_" prefix is dropped, partly to make names shorter, and partly to help clarify what is an internal function. I prefer avoiding the vkd3d_* prefix on all internal functions, for these reasons. However, I'm open to restoring it. --- libs/vkd3d-shader/spirv.c | 1670 +++++++++++++++--------------- libs/vkd3d-shader/vkd3d_shader_main.c | 10 +- libs/vkd3d-shader/vkd3d_shader_private.h | 10 +- 3 files changed, 845 insertions(+), 845 deletions(-)

1 0

Zebediah Figura : vkd3d-shader/sm4: Use the VKD3D_DXBC_MAX_SOURCE_COUNT macro where possible.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: vkd3d Branch: master Commit: ba08825ccdcc6e8cdf31f174a0f696109f82b614 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ba08825ccdcc6e8cdf31f174a0f69… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Mar 12 15:46:24 2022 -0600 vkd3d-shader/sm4: Use the VKD3D_DXBC_MAX_SOURCE_COUNT macro where possible. --- libs/vkd3d-shader/dxbc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 17be2306..13566c38 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -91,7 +91,7 @@ struct vkd3d_shader_sm4_parser unsigned int output_map[MAX_REG_OUTPUT]; - struct vkd3d_shader_src_param src_param[6]; + struct vkd3d_shader_src_param src_param[VKD3D_DXBC_MAX_SOURCE_COUNT]; struct vkd3d_shader_dst_param dst_param[2]; struct list src_free; struct list src;

1 0

Zebediah Figura : vkd3d-shader/spirv: Avoid using DXBC-specific definitions.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: vkd3d Branch: master Commit: e2aed38509ccb9126c6eee94c2c933181121fc26 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e2aed38509ccb9126c6eee94c2c93… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Mar 12 15:47:38 2022 -0600 vkd3d-shader/spirv: Avoid using DXBC-specific definitions. --- libs/vkd3d-shader/dxbc.c | 6 +++++- libs/vkd3d-shader/spirv.c | 8 ++++---- libs/vkd3d-shader/vkd3d_shader_private.h | 3 ++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 13566c38..40bf3a72 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -21,6 +21,10 @@ #include "vkd3d_shader_private.h" #include "sm4.h" +#define SM4_MAX_SRC_COUNT 6 + +STATIC_ASSERT(SM4_MAX_SRC_COUNT <= SPIRV_MAX_SRC_COUNT); + void dxbc_writer_init(struct dxbc_writer *dxbc) { memset(dxbc, 0, sizeof(*dxbc)); @@ -91,7 +95,7 @@ struct vkd3d_shader_sm4_parser unsigned int output_map[MAX_REG_OUTPUT]; - struct vkd3d_shader_src_param src_param[VKD3D_DXBC_MAX_SOURCE_COUNT]; + struct vkd3d_shader_src_param src_param[SM4_MAX_SRC_COUNT]; struct vkd3d_shader_dst_param dst_param[2]; struct list src_free; struct list src; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index ff8c020a..734ba315 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6938,7 +6938,7 @@ static void spirv_compiler_emit_alu_instruction(struct spirv_compiler *compiler, struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; - uint32_t src_ids[VKD3D_DXBC_MAX_SOURCE_COUNT]; + uint32_t src_ids[SPIRV_MAX_SRC_COUNT]; uint32_t type_id, val_id; unsigned int i; SpvOp op; @@ -6951,7 +6951,7 @@ static void spirv_compiler_emit_alu_instruction(struct spirv_compiler *compiler, } assert(instruction->dst_count == 1); - assert(instruction->src_count <= VKD3D_DXBC_MAX_SOURCE_COUNT); + assert(instruction->src_count <= SPIRV_MAX_SRC_COUNT); type_id = spirv_compiler_get_type_id_for_dst(compiler, dst); @@ -7031,7 +7031,7 @@ static void spirv_compiler_emit_ext_glsl_instruction(struct spirv_compiler *comp struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; - uint32_t src_id[VKD3D_DXBC_MAX_SOURCE_COUNT]; + uint32_t src_id[SPIRV_MAX_SRC_COUNT]; uint32_t instr_set_id, type_id, val_id; enum GLSLstd450 glsl_inst; unsigned int i; @@ -7046,7 +7046,7 @@ static void spirv_compiler_emit_ext_glsl_instruction(struct spirv_compiler *comp instr_set_id = vkd3d_spirv_get_glsl_std450_instr_set(builder); assert(instruction->dst_count == 1); - assert(instruction->src_count <= VKD3D_DXBC_MAX_SOURCE_COUNT); + assert(instruction->src_count <= SPIRV_MAX_SRC_COUNT); type_id = spirv_compiler_get_type_id_for_dst(compiler, dst); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 0c83edf1..a750b55e 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1085,6 +1085,8 @@ int vkd3d_glsl_generator_generate(struct vkd3d_glsl_generator *generator, struct vkd3d_shader_parser *parser, struct vkd3d_shader_code *out); void vkd3d_glsl_generator_destroy(struct vkd3d_glsl_generator *generator); +#define SPIRV_MAX_SRC_COUNT 6 + struct spirv_compiler; struct spirv_compiler *spirv_compiler_create(const struct vkd3d_shader_version *shader_version, @@ -1237,7 +1239,6 @@ static inline void *vkd3d_find_struct_(const struct vkd3d_struct *chain, return NULL; } -#define VKD3D_DXBC_MAX_SOURCE_COUNT 6 #define VKD3D_DXBC_HEADER_SIZE (8 * sizeof(uint32_t)) #define TAG_AON9 VKD3D_MAKE_TAG('A', 'o', 'n', '9')

1 0

Zebediah Figura : vkd3d-shader/sm4: Use a flat array to store source types.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: vkd3d Branch: master Commit: 4173158c8b1636e185b35e27c2ec2f4228b112e9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4173158c8b1636e185b35e27c2ec2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Mar 12 15:50:31 2022 -0600 vkd3d-shader/sm4: Use a flat array to store source types. --- libs/vkd3d-shader/dxbc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 40bf3a72..244a63a0 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -109,7 +109,7 @@ struct vkd3d_sm4_opcode_info enum vkd3d_sm4_opcode opcode; enum vkd3d_shader_opcode handler_idx; const char *dst_info; - const char *src_info; + char src_info[SM4_MAX_SRC_COUNT]; void (*read_opcode_func)(struct vkd3d_shader_instruction *ins, uint32_t opcode, uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv); }; @@ -1520,7 +1520,7 @@ static void shader_sm4_read_instruction(struct vkd3d_shader_parser *parser, stru ins->predicate = NULL; ins->dst_count = strlen(opcode_info->dst_info); ins->dst = sm4->dst_param; - ins->src_count = strlen(opcode_info->src_info); + ins->src_count = strnlen(opcode_info->src_info, SM4_MAX_SRC_COUNT); ins->src = sm4->src_param; assert(ins->dst_count <= ARRAY_SIZE(sm4->dst_param)); assert(ins->src_count <= ARRAY_SIZE(sm4->src_param));

1 0

Zebediah Figura : vkd3d-shader/sm4: Use a flat array to store destination types.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: vkd3d Branch: master Commit: 520c7457a9f39e606fbd063c11f62c6adc5ec6bf URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/520c7457a9f39e606fbd063c11f62… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Mar 12 15:52:41 2022 -0600 vkd3d-shader/sm4: Use a flat array to store destination types. This cuts about 12 kB off of the 64-bit build. --- libs/vkd3d-shader/dxbc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 244a63a0..c06741c5 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -22,6 +22,7 @@ #include "sm4.h" #define SM4_MAX_SRC_COUNT 6 +#define SM4_MAX_DST_COUNT 2 STATIC_ASSERT(SM4_MAX_SRC_COUNT <= SPIRV_MAX_SRC_COUNT); @@ -96,7 +97,7 @@ struct vkd3d_shader_sm4_parser unsigned int output_map[MAX_REG_OUTPUT]; struct vkd3d_shader_src_param src_param[SM4_MAX_SRC_COUNT]; - struct vkd3d_shader_dst_param dst_param[2]; + struct vkd3d_shader_dst_param dst_param[SM4_MAX_DST_COUNT]; struct list src_free; struct list src; struct vkd3d_shader_immediate_constant_buffer icb; @@ -108,7 +109,7 @@ struct vkd3d_sm4_opcode_info { enum vkd3d_sm4_opcode opcode; enum vkd3d_shader_opcode handler_idx; - const char *dst_info; + char dst_info[SM4_MAX_DST_COUNT]; char src_info[SM4_MAX_SRC_COUNT]; void (*read_opcode_func)(struct vkd3d_shader_instruction *ins, uint32_t opcode, uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv); @@ -1518,7 +1519,7 @@ static void shader_sm4_read_instruction(struct vkd3d_shader_parser *parser, stru ins->raw = false; ins->structured = false; ins->predicate = NULL; - ins->dst_count = strlen(opcode_info->dst_info); + ins->dst_count = strnlen(opcode_info->dst_info, SM4_MAX_DST_COUNT); ins->dst = sm4->dst_param; ins->src_count = strnlen(opcode_info->src_info, SM4_MAX_SRC_COUNT); ins->src = sm4->src_param;

1 0

Alexandre Julliard : Wine release 7.0.1
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: website Branch: master Commit: 793548764afd7ad8e002c9c3d9ab3293f667bf1a URL: https://gitlab.winehq.org/winehq/winehq/-/commit/793548764afd7ad8e002c9c3d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 8 15:11:12 2022 +0100 Wine release 7.0.1 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2022110801.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/news/en/2022110801.xml b/news/en/2022110801.xml new file mode 100644 index 00000000..dfe51a8e --- /dev/null +++ b/news/en/2022110801.xml @@ -0,0 +1,14 @@ +<news> +<date>November 8, 2022</date> +<title>Wine 7.0.1 Released</title> +<body> + The Wine development release 7.0.1 is now available. + <a href="{$root}/announce/7.0.1">What's new</a> in this release: +<ul> + <li>Various bug fixes</li> + <li>Translation updates</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/7.0/wine-7.0.1.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-7.0.1 : Alexandre Julliard : Release 7.0.1
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: refs/tags/wine-7.0.1 Tag: f1195c34dfcf74b1a05e4b802accac844b376481 URL: https://gitlab.winehq.org/wine/wine/-/tags/f1195c34dfcf74b1a05e4b802accac84… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 8 15:09:15 2022 +0100 Release 7.0.1

1 0