September 2021 - Wine-commits

Zebediah Figura : vkd3d-shader/hlsl: Write SM4 multiplication instructions.
by Alexandre Julliard 01 Sep '21

01 Sep '21

Module: vkd3d Branch: master Commit: 0d6fb615d2f03c719fa71ec4d9339a08fa8cd08c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0d6fb615d2f03c719fa71ec… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 30 12:21:22 2021 -0500 vkd3d-shader/hlsl: Write SM4 multiplication instructions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 32a4eda..af1660f 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -957,6 +957,10 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, write_sm4_binary_op(buffer, VKD3D_SM4_OP_ADD, &expr->node, arg1, arg2); break; + case HLSL_OP2_MUL: + write_sm4_binary_op(buffer, VKD3D_SM4_OP_MUL, &expr->node, arg1, arg2); + break; + default: hlsl_fixme(ctx, expr->node.loc, "SM4 float \"%s\" expression.", debug_hlsl_expr_op(expr->op)); break;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Write SM4 division instructions.
by Alexandre Julliard 01 Sep '21

01 Sep '21

Module: vkd3d Branch: master Commit: 2fb1643ee0a271c1bacdb6a3a0d7dd36b56e2bae URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2fb1643ee0a271c1bacdb6a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 30 12:21:23 2021 -0500 vkd3d-shader/hlsl: Write SM4 division instructions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index af1660f..ace2eb6 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -957,6 +957,10 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, write_sm4_binary_op(buffer, VKD3D_SM4_OP_ADD, &expr->node, arg1, arg2); break; + case HLSL_OP2_DIV: + write_sm4_binary_op(buffer, VKD3D_SM4_OP_DIV, &expr->node, arg1, arg2); + break; + case HLSL_OP2_MUL: write_sm4_binary_op(buffer, VKD3D_SM4_OP_MUL, &expr->node, arg1, arg2); break;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Write SM4 negation instructions.
by Alexandre Julliard 01 Sep '21

01 Sep '21

Module: vkd3d Branch: master Commit: 7e353ce62b3ea349ec96199373ae57d4f92e5bc3 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7e353ce62b3ea349ec96199… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 30 12:21:24 2021 -0500 vkd3d-shader/hlsl: Write SM4 negation instructions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 5 +---- libs/vkd3d-shader/hlsl_sm4.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index f8385ab..f51233c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -277,10 +277,7 @@ XFAIL_TESTS = \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ tests/trigonometry.shader_test \ - tests/writemask-assignop-0.shader_test \ - tests/writemask-assignop-1.shader_test \ - tests/writemask-assignop-2.shader_test \ - tests/writemask-assignop-3.shader_test + tests/writemask-assignop-1.shader_test endif if BUILD_DEMOS diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index ace2eb6..160da47 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -561,6 +561,7 @@ struct sm4_register unsigned int idx_count; enum vkd3d_sm4_dimension dim; uint32_t immconst_uint[4]; + unsigned int mod; }; struct sm4_instruction @@ -710,6 +711,8 @@ static uint32_t sm4_register_order(const struct sm4_register *reg) if (reg->type == VKD3D_SM4_RT_IMMCONST) order += reg->dim == VKD3D_SM4_DIMENSION_VEC4 ? 4 : 1; order += reg->idx_count; + if (reg->mod) + ++order; return order; } @@ -743,8 +746,13 @@ static void write_sm4_instruction(struct vkd3d_bytecode_buffer *buffer, const st token = sm4_encode_register(&instr->srcs[i].reg); token |= sm4_swizzle_type(instr->srcs[i].reg.type) << VKD3D_SM4_SWIZZLE_TYPE_SHIFT; token |= instr->srcs[i].swizzle << VKD3D_SM4_SWIZZLE_SHIFT; + if (instr->srcs[i].reg.mod) + token |= VKD3D_SM4_REGISTER_MODIFIER; put_u32(buffer, token); + if (instr->srcs[i].reg.mod) + put_u32(buffer, instr->srcs[i].reg.mod); + for (j = 0; j < instr->srcs[i].reg.idx_count; ++j) put_u32(buffer, instr->srcs[i].reg.idx[j]); @@ -894,6 +902,26 @@ static void write_sm4_ret(struct vkd3d_bytecode_buffer *buffer) write_sm4_instruction(buffer, &instr); } +static void write_sm4_unary_op(struct vkd3d_bytecode_buffer *buffer, enum vkd3d_sm4_opcode opcode, + const struct hlsl_ir_node *dst, const struct hlsl_ir_node *src, unsigned int src_mod) +{ + struct sm4_instruction instr; + unsigned int writemask; + + memset(&instr, 0, sizeof(instr)); + instr.opcode = opcode; + + sm4_register_from_node(&instr.dst.reg, &instr.dst.writemask, dst); + instr.has_dst = 1; + + sm4_register_from_node(&instr.srcs[0].reg, &writemask, src); + instr.srcs[0].swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), instr.dst.writemask); + instr.srcs[0].reg.mod = src_mod; + instr.src_count = 1; + + write_sm4_instruction(buffer, &instr); +} + static void write_sm4_binary_op(struct vkd3d_bytecode_buffer *buffer, enum vkd3d_sm4_opcode opcode, const struct hlsl_ir_node *dst, const struct hlsl_ir_node *src1, const struct hlsl_ir_node *src2) { @@ -953,6 +981,10 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, { switch (expr->op) { + case HLSL_OP1_NEG: + write_sm4_unary_op(buffer, VKD3D_SM4_OP_MOV, &expr->node, arg1, VKD3D_SM4_REGISTER_MODIFIER_NEGATE); + break; + case HLSL_OP2_ADD: write_sm4_binary_op(buffer, VKD3D_SM4_OP_ADD, &expr->node, arg1, arg2); break;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Merge the "type" and "base_type" rules.
by Alexandre Julliard 01 Sep '21

01 Sep '21

Module: vkd3d Branch: master Commit: 6ee423a21b0627bbf73697e3c9377594c759a048 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6ee423a21b0627bbf73697e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 30 12:21:25 2021 -0500 vkd3d-shader/hlsl: Merge the "type" and "base_type" rules. It's certainly invalid to declare a vector of non-scalars, but it doesn't need to result in a syntax error. Indeed native d3dcompiler does not emit a syntax error in this case. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 7906356..6a472c1 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1731,7 +1731,6 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t %type <semantic> semantic -%type <type> base_type %type <type> field_type %type <type> named_struct_spec %type <type> unnamed_struct_spec @@ -2145,11 +2144,7 @@ input_mod: } type: - base_type - { - $$ = $1; - } - | KW_VECTOR '<' base_type ',' C_INTEGER '>' + KW_VECTOR '<' type ',' C_INTEGER '>' { if ($3->type != HLSL_CLASS_SCALAR) { @@ -2171,7 +2166,7 @@ type: $$ = hlsl_new_type(ctx, NULL, HLSL_CLASS_VECTOR, $3->base_type, $5, 1); } - | KW_MATRIX '<' base_type ',' C_INTEGER ',' C_INTEGER '>' + | KW_MATRIX '<' type ',' C_INTEGER ',' C_INTEGER '>' { if ($3->type != HLSL_CLASS_SCALAR) { @@ -2199,9 +2194,7 @@ type: $$ = hlsl_new_type(ctx, NULL, HLSL_CLASS_MATRIX, $3->base_type, $7, $5); } - -base_type: - KW_VOID + | KW_VOID { $$ = ctx->builtin_types.Void; }

1 0

Zebediah Figura : vkd3d-shader/hlsl: Use the modifiers location when validating modifiers on casts.
by Alexandre Julliard 01 Sep '21

01 Sep '21

Module: vkd3d Branch: master Commit: 28092bb200952d2b540c114e755f05c4b0f7dee9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=28092bb200952d2b540c114… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 30 12:21:26 2021 -0500 vkd3d-shader/hlsl: Use the modifiers location when validating modifiers on casts. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 6a472c1..26ba469 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2836,7 +2836,7 @@ unary_expr: if ($2) { - hlsl_error(ctx, @3, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, + hlsl_error(ctx, @2, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, "Modifiers are not allowed on casts."); YYABORT; }

1 0

Henri Verbeet : vkd3d-shader: Dump HLSL shaders with a ".hlsl" suffix.
by Alexandre Julliard 01 Sep '21

01 Sep '21

Module: vkd3d Branch: master Commit: cfc09a210af0fe358b3bcf7fb669b72f46a6f9ee URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=cfc09a210af0fe358b3bcf7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 1 15:45:05 2021 +0200 vkd3d-shader: Dump HLSL shaders with a ".hlsl" suffix. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 2 +- libs/vkd3d-shader/vkd3d_shader_main.c | 27 ++++++++++++++++++++++----- libs/vkd3d-shader/vkd3d_shader_private.h | 3 ++- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 7b246bf..13ef6cf 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1798,7 +1798,7 @@ int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d return VKD3D_ERROR_NOT_IMPLEMENTED; } - vkd3d_shader_dump_shader(profile->type, &compile_info->source); + vkd3d_shader_dump_shader(compile_info->source_type, profile->type, &compile_info->source); if (!hlsl_ctx_init(&ctx, profile, message_context)) return VKD3D_ERROR_OUT_OF_MEMORY; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 16994d2..5fab515 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -310,7 +310,8 @@ void set_u32(struct vkd3d_bytecode_buffer *buffer, size_t offset, uint32_t value memcpy(buffer->data + offset, &value, sizeof(value)); } -static void vkd3d_shader_dump_blob(const char *path, const char *prefix, const void *data, size_t size) +static void vkd3d_shader_dump_blob(const char *path, const char *prefix, + const char *suffix, const void *data, size_t size) { static int shader_id = 0; char filename[1024]; @@ -319,7 +320,7 @@ static void vkd3d_shader_dump_blob(const char *path, const char *prefix, const v id = InterlockedIncrement(&shader_id) - 1; - snprintf(filename, ARRAY_SIZE(filename), "%s/vkd3d-shader-%s-%u.dxbc", path, prefix, id); + snprintf(filename, ARRAY_SIZE(filename), "%s/vkd3d-shader-%s-%u.%s", path, prefix, id, suffix); if ((f = fopen(filename, "wb"))) { if (fwrite(data, 1, size, f) != size) @@ -333,7 +334,22 @@ static void vkd3d_shader_dump_blob(const char *path, const char *prefix, const v } } -void vkd3d_shader_dump_shader(enum vkd3d_shader_type type, const struct vkd3d_shader_code *shader) +static const char *shader_get_source_type_suffix(enum vkd3d_shader_source_type type) +{ + switch (type) + { + case VKD3D_SHADER_SOURCE_DXBC_TPF: + return "dxbc"; + case VKD3D_SHADER_SOURCE_HLSL: + return "hlsl"; + default: + FIXME("Unhandled source type %#x.\n", type); + return "bin"; + } +} + +void vkd3d_shader_dump_shader(enum vkd3d_shader_source_type source_type, + enum vkd3d_shader_type shader_type, const struct vkd3d_shader_code *shader) { static bool enabled = true; const char *path; @@ -347,7 +363,8 @@ void vkd3d_shader_dump_shader(enum vkd3d_shader_type type, const struct vkd3d_sh return; } - vkd3d_shader_dump_blob(path, shader_get_type_prefix(type), shader->code, shader->size); + vkd3d_shader_dump_blob(path, shader_get_type_prefix(shader_type), + shader_get_source_type_suffix(source_type), shader->code, shader->size); } struct vkd3d_shader_parser @@ -1022,7 +1039,7 @@ static int compile_dxbc_tpf(const struct vkd3d_shader_compile_info *compile_info return ret; } - vkd3d_shader_dump_shader(parser.shader_version.type, &compile_info->source); + vkd3d_shader_dump_shader(compile_info->source_type, parser.shader_version.type, &compile_info->source); if (compile_info->target_type == VKD3D_SHADER_TARGET_D3D_ASM) { diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 54ac532..e195c12 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -975,7 +975,8 @@ void vkd3d_shader_vnote(struct vkd3d_shader_message_context *context, const stru void vkd3d_shader_vwarning(struct vkd3d_shader_message_context *context, const struct vkd3d_shader_location *location, enum vkd3d_shader_error error, const char *format, va_list args); -void vkd3d_shader_dump_shader(enum vkd3d_shader_type type, const struct vkd3d_shader_code *shader); +void vkd3d_shader_dump_shader(enum vkd3d_shader_source_type source_type, + enum vkd3d_shader_type shader_type, const struct vkd3d_shader_code *shader); int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length, struct vkd3d_shader_message_context *message_context, const char *source_name, struct vkd3d_shader_desc *desc);

1 0

Henri Verbeet : vkd3d-shader/hlsl: Set the source name in hlsl_ctx_init().
by Alexandre Julliard 01 Sep '21

01 Sep '21

Module: vkd3d Branch: master Commit: 7fa0de03b907b6a9afb24883edd20acad630ccb1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7fa0de03b907b6a9afb2488… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 1 15:45:06 2021 +0200 vkd3d-shader/hlsl: Set the source name in hlsl_ctx_init(). Without this, HLSL compiler messages were missing the source name. For example, when attempting to compile gears.hlsl from the "gears" demo with vkd3d-compiler: ":33:17: E5000: syntax error, unexpected NEW_IDENTIFIER" Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 13ef6cf..0d53960 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1694,8 +1694,8 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) } } -static bool hlsl_ctx_init(struct hlsl_ctx *ctx, const struct hlsl_profile_info *profile, - struct vkd3d_shader_message_context *message_context) +static bool hlsl_ctx_init(struct hlsl_ctx *ctx, const char *source_name, + const struct hlsl_profile_info *profile, struct vkd3d_shader_message_context *message_context) { memset(ctx, 0, sizeof(*ctx)); @@ -1705,7 +1705,7 @@ static bool hlsl_ctx_init(struct hlsl_ctx *ctx, const struct hlsl_profile_info * if (!(ctx->source_files = hlsl_alloc(ctx, sizeof(*ctx->source_files)))) return false; - if (!(ctx->source_files[0] = hlsl_strdup(ctx, ""))) + if (!(ctx->source_files[0] = hlsl_strdup(ctx, source_name ? source_name : "<anonymous>"))) { vkd3d_free(ctx->source_files); return false; @@ -1800,7 +1800,7 @@ int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d vkd3d_shader_dump_shader(compile_info->source_type, profile->type, &compile_info->source); - if (!hlsl_ctx_init(&ctx, profile, message_context)) + if (!hlsl_ctx_init(&ctx, compile_info->source_name, profile, message_context)) return VKD3D_ERROR_OUT_OF_MEMORY; if ((ret = hlsl_lexer_compile(&ctx, hlsl)) == 2)

1 0

Henri Verbeet : vkd3d-shader: Only use scan_dxbc() for scanning dxbc-tpf source.
by Alexandre Julliard 01 Sep '21

01 Sep '21

Module: vkd3d Branch: master Commit: a8b062000eb633c2f37d03919c391e4c8ccf1535 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a8b062000eb633c2f37d039… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 1 15:45:07 2021 +0200 vkd3d-shader: Only use scan_dxbc() for scanning dxbc-tpf source. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/vkd3d_shader_main.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 5fab515..e28cfad 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1006,7 +1006,22 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char vkd3d_shader_message_context_init(&message_context, compile_info->log_level); - ret = scan_dxbc(compile_info, &message_context); + switch (compile_info->source_type) + { + case VKD3D_SHADER_SOURCE_DXBC_TPF: + ret = scan_dxbc(compile_info, &message_context); + break; + + case VKD3D_SHADER_SOURCE_HLSL: + FIXME("HLSL support not implemented.\n"); + ret = VKD3D_ERROR_NOT_IMPLEMENTED; + break; + + default: + ERR("Unsupported source type %#x.\n", compile_info->source_type); + ret = VKD3D_ERROR_INVALID_ARGUMENT; + break; + } vkd3d_shader_message_context_trace_messages(&message_context); if (!vkd3d_shader_message_context_copy_messages(&message_context, messages))

1 0

Henri Verbeet : vkd3d-shader: Pass a vkd3d_shader_parser structure to vkd3d_shader_trace().
by Alexandre Julliard 01 Sep '21

01 Sep '21

Module: vkd3d Branch: master Commit: a129206e7ef9c7815fce26f7447fe5354fde803a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a129206e7ef9c7815fce26f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 1 15:45:08 2021 +0200 vkd3d-shader: Pass a vkd3d_shader_parser structure to vkd3d_shader_trace(). Mostly to avoid passing around void pointers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 4 ++-- libs/vkd3d-shader/vkd3d_shader_main.c | 10 +--------- libs/vkd3d-shader/vkd3d_shader_private.h | 10 +++++++++- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 26bc788..78ec1c1 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1900,12 +1900,12 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, return result; } -void vkd3d_shader_trace(void *data) +void vkd3d_shader_trace(struct vkd3d_shader_parser *parser) { const char *p, *q, *end; struct vkd3d_shader_code code; - if (vkd3d_dxbc_binary_to_text(data, NULL, &code) != VKD3D_OK) + if (vkd3d_dxbc_binary_to_text(parser->data, NULL, &code) != VKD3D_OK) return; end = (const char *)code.code + code.size; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index e28cfad..0cfe1ea 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -367,14 +367,6 @@ void vkd3d_shader_dump_shader(enum vkd3d_shader_source_type source_type, shader_get_source_type_suffix(source_type), shader->code, shader->size); } -struct vkd3d_shader_parser -{ - struct vkd3d_shader_desc shader_desc; - struct vkd3d_shader_version shader_version; - void *data; - const DWORD *ptr; -}; - static int vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser, const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_message_context *message_context) { @@ -960,7 +952,7 @@ static int scan_dxbc(const struct vkd3d_shader_compile_info *compile_info, } if (TRACE_ON()) - vkd3d_shader_trace(parser.data); + vkd3d_shader_trace(&parser); while (!shader_sm4_is_end(parser.data, &parser.ptr)) { diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index e195c12..6c40efa 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -874,7 +874,15 @@ static inline bool vkd3d_shader_register_is_output(const struct vkd3d_shader_reg return reg->type == VKD3DSPR_OUTPUT || reg->type == VKD3DSPR_COLOROUT; } -void vkd3d_shader_trace(void *data); +struct vkd3d_shader_parser +{ + struct vkd3d_shader_desc shader_desc; + struct vkd3d_shader_version shader_version; + void *data; + const uint32_t *ptr; +}; + +void vkd3d_shader_trace(struct vkd3d_shader_parser *parser); const char *shader_get_type_prefix(enum vkd3d_shader_type type);

1 0

Henri Verbeet : vkd3d-shader: Pass a vkd3d_shader_parser structure to vkd3d_dxbc_binary_to_text().
by Alexandre Julliard 01 Sep '21

01 Sep '21

Module: vkd3d Branch: master Commit: 1c8b0d1062a20d84a9d61e132c0dad65f3799723 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1c8b0d1062a20d84a9d61e1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 1 15:45:09 2021 +0200 vkd3d-shader: Pass a vkd3d_shader_parser structure to vkd3d_dxbc_binary_to_text(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 10 +++++----- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 78ec1c1..3b01b53 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1771,7 +1771,7 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, shader_addline(buffer, "\n"); } -enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, +enum vkd3d_result vkd3d_dxbc_binary_to_text(struct vkd3d_shader_parser *parser, const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out) { enum vkd3d_shader_compile_option_formatting_flags formatting; @@ -1831,17 +1831,17 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, vkd3d_string_buffer_init(buffer); shader_version = &compiler.shader_version; - shader_sm4_read_header(data, &ptr, shader_version); + shader_sm4_read_header(parser->data, &ptr, shader_version); vkd3d_string_buffer_printf(buffer, "%s%s_%u_%u%s\n", compiler.colours.version, shader_get_type_prefix(shader_version->type), shader_version->major, shader_version->minor, compiler.colours.reset); indent = 0; - while (!shader_sm4_is_end(data, &ptr)) + while (!shader_sm4_is_end(parser->data, &ptr)) { struct vkd3d_shader_instruction ins; - shader_sm4_read_instruction(data, &ptr, &ins); + shader_sm4_read_instruction(parser->data, &ptr, &ins); if (ins.handler_idx == VKD3DSIH_INVALID) { WARN("Skipping unrecognized instruction.\n"); @@ -1905,7 +1905,7 @@ void vkd3d_shader_trace(struct vkd3d_shader_parser *parser) const char *p, *q, *end; struct vkd3d_shader_code code; - if (vkd3d_dxbc_binary_to_text(parser->data, NULL, &code) != VKD3D_OK) + if (vkd3d_dxbc_binary_to_text(parser, NULL, &code) != VKD3D_OK) return; end = (const char *)code.code + code.size; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 0cfe1ea..36c211e 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1051,7 +1051,7 @@ static int compile_dxbc_tpf(const struct vkd3d_shader_compile_info *compile_info if (compile_info->target_type == VKD3D_SHADER_TARGET_D3D_ASM) { vkd3d_shader_free_scan_descriptor_info(&scan_descriptor_info); - ret = vkd3d_dxbc_binary_to_text(parser.data, compile_info, out); + ret = vkd3d_dxbc_binary_to_text(&parser, compile_info, out); vkd3d_shader_parser_destroy(&parser); return ret; } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 6c40efa..97c1999 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -910,7 +910,7 @@ struct vkd3d_string_buffer_cache size_t count, max_count, capacity; }; -enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, +enum vkd3d_result vkd3d_dxbc_binary_to_text(struct vkd3d_shader_parser *parser, const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out); void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer); struct vkd3d_string_buffer *vkd3d_string_buffer_get(struct vkd3d_string_buffer_cache *list);

1 0