February 2023 - Wine-commits

Francisco Casas : vkd3d-shader/hlsl: Set writemasks correctly for SM1 scalar and vector types.
by Alexandre Julliard 08 Feb '23

08 Feb '23

Module: vkd3d Branch: master Commit: b84f560bdf59c35e093e51bfdf9a166c196d3a9b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b84f560bdf59c35e093e51bfdf9a1… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Feb 2 14:41:13 2023 -0300 vkd3d-shader/hlsl: Set writemasks correctly for SM1 scalar and vector types. Because of the change introduced in f21693b2 vkd3d-shader/hlsl: Use reg_size as component count when allocating a single register. SM1 scalars and vectors were not longer getting the correct writemask when they are allocated. This happened because they have to reserve the whole register even if they only use some of its components, so their reg_size may differ from the number of components. This commit fixes that. --- libs/vkd3d-shader/hlsl_codegen.c | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 83b4c6b6..7c95ebd1 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -2231,6 +2231,15 @@ static struct hlsl_reg allocate_range(struct hlsl_ctx *ctx, struct liveness *liv return ret; } +static struct hlsl_reg allocate_numeric_registers_for_type(struct hlsl_ctx *ctx, struct liveness *liveness, + unsigned int first_write, unsigned int last_read, const struct hlsl_type *type) +{ + if (type->type <= HLSL_CLASS_VECTOR) + return allocate_register(ctx, liveness, first_write, last_read, type->reg_size, type->dimx); + else + return allocate_range(ctx, liveness, first_write, last_read, type->reg_size); +} + static const char *debug_register(char class, struct hlsl_reg reg, const struct hlsl_type *type) { static const char writemask_offset[] = {'w','x','y','z'}; @@ -2254,12 +2263,9 @@ static void allocate_variable_temp_register(struct hlsl_ctx *ctx, struct hlsl_ir if (!var->reg.allocated && var->last_read) { - if (var->data_type->reg_size > 4) - var->reg = allocate_range(ctx, liveness, var->first_write, - var->last_read, var->data_type->reg_size); - else - var->reg = allocate_register(ctx, liveness, var->first_write, - var->last_read, var->data_type->reg_size, var->data_type->reg_size); + var->reg = allocate_numeric_registers_for_type(ctx, liveness, var->first_write, var->last_read, + var->data_type); + TRACE("Allocated %s to %s (liveness %u-%u).\n", var->name, debug_register('r', var->reg, var->data_type), var->first_write, var->last_read); } @@ -2273,12 +2279,8 @@ static void allocate_temp_registers_recurse(struct hlsl_ctx *ctx, struct hlsl_bl { if (!instr->reg.allocated && instr->last_read) { - if (instr->data_type->reg_size > 4) - instr->reg = allocate_range(ctx, liveness, instr->index, - instr->last_read, instr->data_type->reg_size); - else - instr->reg = allocate_register(ctx, liveness, instr->index, - instr->last_read, instr->data_type->reg_size, instr->data_type->reg_size); + instr->reg = allocate_numeric_registers_for_type(ctx, liveness, instr->index, instr->last_read, + instr->data_type); TRACE("Allocated anonymous expression @%u to %s (liveness %u-%u).\n", instr->index, debug_register('r', instr->reg, instr->data_type), instr->index, instr->last_read); } @@ -2338,10 +2340,7 @@ static void allocate_const_registers_recurse(struct hlsl_ctx *ctx, struct hlsl_b unsigned int x, y, i, writemask, end_reg; unsigned int reg_size = type->reg_size; - if (reg_size > 4) - constant->reg = allocate_range(ctx, liveness, 1, UINT_MAX, reg_size); - else - constant->reg = allocate_register(ctx, liveness, 1, UINT_MAX, reg_size, reg_size); + constant->reg = allocate_numeric_registers_for_type(ctx, liveness, 1, UINT_MAX, type); TRACE("Allocated constant @%u to %s.\n", instr->index, debug_register('c', constant->reg, type)); if (!hlsl_array_reserve(ctx, (void **)&defs->values, &defs->size, @@ -2438,10 +2437,7 @@ static void allocate_const_registers(struct hlsl_ctx *ctx, struct hlsl_ir_functi if (var->data_type->reg_size == 0) continue; - if (var->data_type->reg_size > 4) - var->reg = allocate_range(ctx, &liveness, 1, UINT_MAX, var->data_type->reg_size); - else - var->reg = allocate_register(ctx, &liveness, 1, UINT_MAX, 4, var->data_type->reg_size); + var->reg = allocate_numeric_registers_for_type(ctx, &liveness, 1, UINT_MAX, var->data_type); TRACE("Allocated %s to %s.\n", var->name, debug_register('c', var->reg, var->data_type)); } }

1 0

Francisco Casas : vkd3d-shader/hlsl: Map SM1 src swizzles outside write_sm1_instruction().
by Alexandre Julliard 08 Feb '23

08 Feb '23

Module: vkd3d Branch: master Commit: d01729921c18912708ac3fb75413674e2a678a49 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d01729921c18912708ac3fb754136… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Feb 3 11:25:19 2023 -0300 vkd3d-shader/hlsl: Map SM1 src swizzles outside write_sm1_instruction(). Not every instruction expects src swizzles to be mapped according to the dst writemasks, so this logic must be outside this function. --- libs/vkd3d-shader/hlsl_sm1.c | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index 60b54a42..ebeaadb1 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -435,11 +435,9 @@ static void write_sm1_dst_register(struct vkd3d_bytecode_buffer *buffer, const s } static void write_sm1_src_register(struct vkd3d_bytecode_buffer *buffer, - const struct sm1_src_register *reg, unsigned int dst_writemask) + const struct sm1_src_register *reg) { - unsigned int swizzle = hlsl_map_swizzle(reg->swizzle, dst_writemask); - - put_u32(buffer, (1u << 31) | sm1_encode_register_type(reg->type) | reg->mod | (swizzle << 16) | reg->reg); + put_u32(buffer, (1u << 31) | sm1_encode_register_type(reg->type) | reg->mod | (reg->swizzle << 16) | reg->reg); } static void write_sm1_instruction(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, @@ -456,14 +454,19 @@ static void write_sm1_instruction(struct hlsl_ctx *ctx, struct vkd3d_bytecode_bu write_sm1_dst_register(buffer, &instr->dst); for (i = 0; i < instr->src_count; ++i) - write_sm1_src_register(buffer, &instr->srcs[i], instr->dst.writemask); + write_sm1_src_register(buffer, &instr->srcs[i]); }; +static void sm1_map_src_swizzle(struct sm1_src_register *src, unsigned int map_writemask) +{ + src->swizzle = hlsl_map_swizzle(src->swizzle, map_writemask); +} + static void write_sm1_ternary_op(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, D3DSHADER_INSTRUCTION_OPCODE_TYPE opcode, const struct hlsl_reg *dst, const struct hlsl_reg *src1, const struct hlsl_reg *src2, const struct hlsl_reg *src3) { - const struct sm1_instruction instr = + struct sm1_instruction instr = { .opcode = opcode, @@ -483,6 +486,10 @@ static void write_sm1_ternary_op(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buf .srcs[2].reg = src3->id, .src_count = 3, }; + + sm1_map_src_swizzle(&instr.srcs[0], instr.dst.writemask); + sm1_map_src_swizzle(&instr.srcs[1], instr.dst.writemask); + sm1_map_src_swizzle(&instr.srcs[2], instr.dst.writemask); write_sm1_instruction(ctx, buffer, &instr); } @@ -490,7 +497,7 @@ static void write_sm1_binary_op(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buff D3DSHADER_INSTRUCTION_OPCODE_TYPE opcode, const struct hlsl_reg *dst, const struct hlsl_reg *src1, const struct hlsl_reg *src2) { - const struct sm1_instruction instr = + struct sm1_instruction instr = { .opcode = opcode, @@ -507,6 +514,9 @@ static void write_sm1_binary_op(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buff .srcs[1].reg = src2->id, .src_count = 2, }; + + sm1_map_src_swizzle(&instr.srcs[0], instr.dst.writemask); + sm1_map_src_swizzle(&instr.srcs[1], instr.dst.writemask); write_sm1_instruction(ctx, buffer, &instr); } @@ -514,7 +524,7 @@ static void write_sm1_unary_op(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffe D3DSHADER_INSTRUCTION_OPCODE_TYPE opcode, const struct hlsl_reg *dst, const struct hlsl_reg *src, D3DSHADER_PARAM_SRCMOD_TYPE src_mod, D3DSHADER_PARAM_DSTMOD_TYPE dst_mod) { - const struct sm1_instruction instr = + struct sm1_instruction instr = { .opcode = opcode, @@ -530,6 +540,8 @@ static void write_sm1_unary_op(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffe .srcs[0].mod = src_mod, .src_count = 1, }; + + sm1_map_src_swizzle(&instr.srcs[0], instr.dst.writemask); write_sm1_instruction(ctx, buffer, &instr); } @@ -634,6 +646,7 @@ static void write_sm1_constant(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffe assert(instr->reg.allocated); assert(constant->reg.allocated); + sm1_map_src_swizzle(&sm1_instr.srcs[0], sm1_instr.dst.writemask); write_sm1_instruction(ctx, buffer, &sm1_instr); } @@ -777,6 +790,7 @@ static void write_sm1_load(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b sm1_instr.srcs[0].swizzle = hlsl_swizzle_from_writemask((1 << load->src.var->data_type->dimx) - 1); } + sm1_map_src_swizzle(&sm1_instr.srcs[0], sm1_instr.dst.writemask); write_sm1_instruction(ctx, buffer, &sm1_instr); } @@ -822,6 +836,7 @@ static void write_sm1_store(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer * else assert(reg.allocated); + sm1_map_src_swizzle(&sm1_instr.srcs[0], sm1_instr.dst.writemask); write_sm1_instruction(ctx, buffer, &sm1_instr); } @@ -848,6 +863,7 @@ static void write_sm1_swizzle(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer assert(instr->reg.allocated); assert(val->reg.allocated); + sm1_map_src_swizzle(&sm1_instr.srcs[0], sm1_instr.dst.writemask); write_sm1_instruction(ctx, buffer, &sm1_instr); }

1 0

Francisco Casas : vkd3d-shader/hlsl: Fix SM1 dp2add swizzles.
by Alexandre Julliard 08 Feb '23

08 Feb '23

Module: vkd3d Branch: master Commit: 902ddee557f3b2c0e5bb668c7330b79b7954ebce URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/902ddee557f3b2c0e5bb668c7330b… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Feb 3 12:17:26 2023 -0300 vkd3d-shader/hlsl: Fix SM1 dp2add swizzles. SM1 dp2add doesn't map src swizzles to the dst writemask, also it expects the last argument to have a replicate swizzle. Before this patch we were writing the operation as: ``` dp2add r0.x, r1.x, r0.x, r2.x ``` and now it is: ``` dp2add r0.x, r1.xyxx, r0.xyxx, r2.x ``` dp2add now has its own function, write_sm1_dp2add(), since it seems to be the only instruction with this structure. Ideally we would be using the default swizzles for the first two src arguments: ``` dp2add r0.x, r1, r0, r2.x ``` since, according to native's documentation, these are supported for all sm < 4. But this change -- along with following the convention of repeating the last component of the swizzle when fewer than 4 components are to be specified -- would require more global changes, probably in hlsl_swizzle_from_writemask() and hlsl_map_swizzle(). --- libs/vkd3d-shader/hlsl_sm1.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index ebeaadb1..34bead54 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -462,13 +462,13 @@ static void sm1_map_src_swizzle(struct sm1_src_register *src, unsigned int map_w src->swizzle = hlsl_map_swizzle(src->swizzle, map_writemask); } -static void write_sm1_ternary_op(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, - D3DSHADER_INSTRUCTION_OPCODE_TYPE opcode, const struct hlsl_reg *dst, - const struct hlsl_reg *src1, const struct hlsl_reg *src2, const struct hlsl_reg *src3) +static void write_sm1_dp2add(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, + const struct hlsl_reg *dst, const struct hlsl_reg *src1, const struct hlsl_reg *src2, + const struct hlsl_reg *src3) { struct sm1_instruction instr = { - .opcode = opcode, + .opcode = D3DSIO_DP2ADD, .dst.type = D3DSPR_TEMP, .dst.writemask = dst->writemask, @@ -487,9 +487,6 @@ static void write_sm1_ternary_op(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buf .src_count = 3, }; - sm1_map_src_swizzle(&instr.srcs[0], instr.dst.writemask); - sm1_map_src_swizzle(&instr.srcs[1], instr.dst.writemask); - sm1_map_src_swizzle(&instr.srcs[2], instr.dst.writemask); write_sm1_instruction(ctx, buffer, &instr); } @@ -742,7 +739,7 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b break; case HLSL_OP3_DP2ADD: - write_sm1_ternary_op(ctx, buffer, D3DSIO_DP2ADD, &instr->reg, &arg1->reg, &arg2->reg, &arg3->reg); + write_sm1_dp2add(ctx, buffer, &instr->reg, &arg1->reg, &arg2->reg, &arg3->reg); break; default:

1 0

Alistair Leslie-Hughes : odbccp32: Append DLL path when loading driver.
by Alexandre Julliard 07 Feb '23

07 Feb '23

Module: wine Branch: master Commit: 6714e32d73409e7f4bea8f44b8be6aa4c29c9f25 URL: https://gitlab.winehq.org/wine/wine/-/commit/6714e32d73409e7f4bea8f44b8be6a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Feb 5 14:54:48 2023 +1100 odbccp32: Append DLL path when loading driver. For example, loading by full path myodbc8a.dll can cause a load failure since it dependencies libcrypto-1_1.dll, libssl-1_1.dll are in the DLL directory. --- dlls/odbccp32/odbccp32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 131cb158ed6..0025fad7c4b 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -271,7 +271,7 @@ static HMODULE load_config_driver(const WCHAR *driver) return NULL; } - hmod = LoadLibraryW(filename); + hmod = LoadLibraryExW(filename, NULL, LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR | LOAD_LIBRARY_SEARCH_DEFAULT_DIRS); HeapFree(GetProcessHeap(), 0, filename); if(!hmod)

1 0

Zebediah Figura : vkd3d: Fix checking for failure from SleepConditionVariableCS().
by Alexandre Julliard 07 Feb '23

07 Feb '23

Module: vkd3d Branch: master Commit: 898fc9e198f18265316ab146966f04e641343165 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/898fc9e198f18265316ab146966f0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Feb 3 18:50:32 2023 -0600 vkd3d: Fix checking for failure from SleepConditionVariableCS(). Fixes: 552926cfca64db45e9731f675c65a7214bfa6441 --- libs/vkd3d/vkd3d_private.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 9920275d..9c7bed39 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -244,10 +244,7 @@ static inline void vkd3d_cond_broadcast(struct vkd3d_cond *cond) static inline void vkd3d_cond_wait(struct vkd3d_cond *cond, struct vkd3d_mutex *lock) { - BOOL ret; - - ret = SleepConditionVariableCS(&cond->cond, &lock->lock, INFINITE); - if (ret) + if (!SleepConditionVariableCS(&cond->cond, &lock->lock, INFINITE)) ERR("Could not sleep on the condition variable, error %u.\n", GetLastError()); }

1 0

Zebediah Figura : tests: Add more tests for function definitions.
by Alexandre Julliard 07 Feb '23

07 Feb '23

Module: vkd3d Branch: master Commit: 721c7aa22c818c3f54a253fe1df7491f4f21d990 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/721c7aa22c818c3f54a253fe1df74… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 31 18:49:38 2023 -0600 tests: Add more tests for function definitions. --- tests/hlsl-function.shader_test | 61 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/tests/hlsl-function.shader_test b/tests/hlsl-function.shader_test index e3ed5819..fa35963d 100644 --- a/tests/hlsl-function.shader_test +++ b/tests/hlsl-function.shader_test @@ -106,8 +106,39 @@ float4 main() : sv_target return 0; } +% The function must have been at least declared before calling it. It may have +% been declared with a different but compatible type, though. + +[pixel shader fail] + +float4 main() : sv_target +{ + func(); + return 0; +} + +void func() +{ +} + +[pixel shader todo] + +void func(); + +float4 main() : sv_target +{ + func(); + return 0; +} + +void func() +{ +} + [pixel shader fail] +void func(float arg); + float4 main() : sv_target { func(); @@ -120,6 +151,36 @@ void func() [pixel shader todo] +/* This is something of an internal test: we need to make sure that we use the + * correct variables for a function's arguments and returns regardless of + * whether it's been defined yet. + * + * Also, make sure that we can handle the case where the argument names differ. + */ + +float2 concat(float x, float y); + +float2 func(void) +{ + return concat(0.1, 0.2); +} + +float2 concat(float a, float b) +{ + return float2(a, b); +} + +float4 main() : sv_target +{ + return float4(func(), concat(0.3, 0.4)); +} + +[test] +todo draw quad +todo probe all rgba (0.1, 0.2, 0.3, 0.4) + +[pixel shader todo] + float func(in float a, out float b, inout float c) { c -= 0.2;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Store function parameters in an array.
by Alexandre Julliard 07 Feb '23

07 Feb '23

Module: vkd3d Branch: master Commit: cb2c89a589f149c7ffff97d4f56fb870eb126d41 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/cb2c89a589f149c7ffff97d4f56fb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 31 19:27:01 2023 -0600 vkd3d-shader/hlsl: Store function parameters in an array. --- libs/vkd3d-shader/hlsl.c | 50 ++++++++++++++------------------ libs/vkd3d-shader/hlsl.h | 19 +++++++----- libs/vkd3d-shader/hlsl.y | 62 +++++++++++++++++++++------------------- libs/vkd3d-shader/hlsl_codegen.c | 4 ++- 4 files changed, 70 insertions(+), 65 deletions(-)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Add a hlsl_cleanup_semantic() helper.
by Alexandre Julliard 07 Feb '23

07 Feb '23

Module: vkd3d Branch: master Commit: 8755a92196a57070dbe5e4254c754c7b32d7bc19 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8755a92196a57070dbe5e4254c754… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 31 19:44:46 2023 -0600 vkd3d-shader/hlsl: Add a hlsl_cleanup_semantic() helper. --- libs/vkd3d-shader/hlsl.c | 10 ++++++++-- libs/vkd3d-shader/hlsl.h | 2 ++ libs/vkd3d-shader/hlsl.y | 2 +- libs/vkd3d-shader/hlsl_codegen.c | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 497c7763..5f4bd01a 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -113,7 +113,7 @@ struct hlsl_ir_var *hlsl_get_var(struct hlsl_scope *scope, const char *name) void hlsl_free_var(struct hlsl_ir_var *decl) { vkd3d_free((void *)decl->name); - vkd3d_free((void *)decl->semantic.name); + hlsl_cleanup_semantic(&decl->semantic); vkd3d_free(decl); } @@ -1998,7 +1998,7 @@ void hlsl_free_type(struct hlsl_type *type) field = &type->e.record.fields[i]; vkd3d_free((void *)field->name); - vkd3d_free((void *)field->semantic.name); + hlsl_cleanup_semantic(&field->semantic); } vkd3d_free((void *)type->e.record.fields); } @@ -2155,6 +2155,12 @@ void hlsl_free_attribute(struct hlsl_attribute *attr) vkd3d_free(attr); } +void hlsl_cleanup_semantic(struct hlsl_semantic *semantic) +{ + vkd3d_free((void *)semantic->name); + memset(semantic, 0, sizeof(*semantic)); +} + static void free_function_decl(struct hlsl_ir_function_decl *decl) { unsigned int i; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index fd6abe14..f6696e4e 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -974,7 +974,9 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry enum vkd3d_shader_target_type target_type, struct vkd3d_shader_code *out); bool hlsl_copy_deref(struct hlsl_ctx *ctx, struct hlsl_deref *deref, const struct hlsl_deref *other); + void hlsl_cleanup_deref(struct hlsl_deref *deref); +void hlsl_cleanup_semantic(struct hlsl_semantic *semantic); void hlsl_replace_node(struct hlsl_ir_node *old, struct hlsl_ir_node *new); diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 00af3f46..a0e2707f 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -922,7 +922,7 @@ static void free_parse_variable_def(struct parse_variable_def *v) free_parse_initializer(&v->initializer); vkd3d_free(v->arrays.sizes); vkd3d_free(v->name); - vkd3d_free((void *)v->semantic.name); + hlsl_cleanup_semantic(&v->semantic); vkd3d_free(v); } diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 25055de5..308e3dae 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -227,7 +227,7 @@ static struct hlsl_ir_var *add_semantic_var(struct hlsl_ctx *ctx, struct hlsl_ir type, var->loc, &new_semantic, modifiers, NULL))) { hlsl_release_string_buffer(ctx, name); - vkd3d_free((void *)new_semantic.name); + hlsl_cleanup_semantic(&new_semantic); return NULL; } hlsl_release_string_buffer(ctx, name);

1 0

Zebediah Figura : vkd3d-shader/hlsl: Put synthetic variables into a dummy scope.
by Alexandre Julliard 07 Feb '23

07 Feb '23

Module: vkd3d Branch: master Commit: 25d49b518daee771b725224a73df9be71b19ad0e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/25d49b518daee771b725224a73df9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 31 22:18:35 2023 -0600 vkd3d-shader/hlsl: Put synthetic variables into a dummy scope. Prevent them from being ever looked up. Our naming scheme for synthetic variables already effectively prevents this, but this is better for clarity. We also will need to be able to move some named variables into a dummy scope to account for complexities around function definition and declarations. --- libs/vkd3d-shader/hlsl.c | 29 +++++++++++++++++++++++------ libs/vkd3d-shader/hlsl.h | 2 ++ 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 5f4bd01a..0c51a57d 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -804,7 +804,7 @@ struct hlsl_ir_var *hlsl_new_synthetic_var(struct hlsl_ctx *ctx, const char *tem var = hlsl_new_var(ctx, name, type, *loc, NULL, 0, NULL); hlsl_release_string_buffer(ctx, string); if (var) - list_add_tail(&ctx->globals->vars, &var->scope_entry); + list_add_tail(&ctx->dummy_scope->vars, &var->scope_entry); return var; } @@ -1258,18 +1258,28 @@ static int compare_hlsl_types_rb(const void *key, const struct rb_entry *entry) return strcmp(name, type->name); } +static struct hlsl_scope *hlsl_new_scope(struct hlsl_ctx *ctx, struct hlsl_scope *upper) +{ + struct hlsl_scope *scope; + + if (!(scope = hlsl_alloc(ctx, sizeof(*scope)))) + return NULL; + list_init(&scope->vars); + rb_init(&scope->types, compare_hlsl_types_rb); + scope->upper = upper; + list_add_tail(&ctx->scopes, &scope->entry); + return scope; +} + void hlsl_push_scope(struct hlsl_ctx *ctx) { struct hlsl_scope *new_scope; - if (!(new_scope = hlsl_alloc(ctx, sizeof(*new_scope)))) + if (!(new_scope = hlsl_new_scope(ctx, ctx->cur_scope))) return; + TRACE("Pushing a new scope.\n"); - list_init(&new_scope->vars); - rb_init(&new_scope->types, compare_hlsl_types_rb); - new_scope->upper = ctx->cur_scope; ctx->cur_scope = new_scope; - list_add_tail(&ctx->scopes, &new_scope->entry); } void hlsl_pop_scope(struct hlsl_ctx *ctx) @@ -2572,6 +2582,13 @@ static bool hlsl_ctx_init(struct hlsl_ctx *ctx, const char *source_name, ctx->matrix_majority = HLSL_COLUMN_MAJOR; list_init(&ctx->scopes); + + if (!(ctx->dummy_scope = hlsl_new_scope(ctx, NULL))) + { + vkd3d_free((void *)ctx->source_files[0]); + vkd3d_free(ctx->source_files); + return false; + } hlsl_push_scope(ctx); ctx->globals = ctx->cur_scope; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index f6696e4e..567e3ad3 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -698,6 +698,8 @@ struct hlsl_ctx struct hlsl_scope *cur_scope; /* Scope of global variables. */ struct hlsl_scope *globals; + /* Dummy scope for variables which should never be looked up by name. */ + struct hlsl_scope *dummy_scope; /* List of all the scopes in the program; linked by the hlsl_scope.entry fields. */ struct list scopes; /* List of all the extern variables; linked by the hlsl_ir_var.extern_entry fields.

1 0

Zebediah Figura : vkd3d-shader/hlsl: Use the original hlsl_ir_function_decl struct rather than allocating a new one for each definition.
by Alexandre Julliard 07 Feb '23

07 Feb '23

Module: vkd3d Branch: master Commit: 4c46075d864c2959a0c042c6bc7201fc40c414ba URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4c46075d864c2959a0c042c6bc720… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 31 19:59:06 2023 -0600 vkd3d-shader/hlsl: Use the original hlsl_ir_function_decl struct rather than allocating a new one for each definition. We need to make sure every invocation points to the same hlsl_ir_function_decl and the same parameters. This fixes some invalid memory accesses. --- libs/vkd3d-shader/hlsl.c | 28 +------- libs/vkd3d-shader/hlsl.y | 178 ++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 150 insertions(+), 56 deletions(-)

1 0