- Wine-Commits - list.winehq.org

Zebediah Figura : vkd3d-shader/hlsl: Make a string array const.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: vkd3d Branch: master Commit: 1514755043ccc6925ab345d25549de520fc66339 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1514755043ccc6925ab345d25549d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Apr 5 15:22:03 2023 -0500 vkd3d-shader/hlsl: Make a string array const. --- libs/vkd3d-shader/hlsl_codegen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index c8550b65..f3fcbb71 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -2816,7 +2816,7 @@ static void allocate_temp_registers(struct hlsl_ctx *ctx, struct hlsl_ir_functio static void allocate_semantic_register(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, unsigned int *counter, bool output) { - static const char *shader_names[] = + static const char *const shader_names[] = { [VKD3D_SHADER_TYPE_PIXEL] = "Pixel", [VKD3D_SHADER_TYPE_VERTEX] = "Vertex",

1 0

Zebediah Figura : vkd3d-shader: Reuse the existing parser for scanning in compile_dxbc_tpf().
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: vkd3d Branch: master Commit: 507e8644ae38ddd16b8b824b3c7250434ddec9a4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/507e8644ae38ddd16b8b824b3c725… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Mar 12 16:45:41 2022 -0600 vkd3d-shader: Reuse the existing parser for scanning in compile_dxbc_tpf(). --- libs/vkd3d-shader/vkd3d_shader_main.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index b2b885aa..11e32ab0 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1181,18 +1181,20 @@ static int compile_dxbc_tpf(const struct vkd3d_shader_compile_info *compile_info scan_descriptor_info.next = scan_info.next; scan_info.next = &scan_descriptor_info; - if ((ret = scan_dxbc(&scan_info, message_context)) < 0) - return ret; - if ((ret = vkd3d_shader_sm4_parser_create(compile_info, message_context, &parser)) < 0) { WARN("Failed to initialise shader parser.\n"); - vkd3d_shader_free_scan_descriptor_info(&scan_descriptor_info); return ret; } vkd3d_shader_dump_shader(compile_info->source_type, parser->shader_version.type, &compile_info->source); + if ((ret = scan_with_parser(&scan_info, message_context, parser)) < 0) + { + vkd3d_shader_parser_destroy(parser); + return ret; + } + if (compile_info->target_type == VKD3D_SHADER_TARGET_D3D_ASM) { vkd3d_shader_free_scan_descriptor_info(&scan_descriptor_info);

1 0

Zebediah Figura : vkd3d-shader: Explicitly align the size in bytecode_get_next_offset() and rename it accordingly.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: vkd3d Branch: master Commit: a60c47ff39290246e25ce3eac501caf63010987d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a60c47ff39290246e25ce3eac501c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Apr 5 16:55:50 2023 -0500 vkd3d-shader: Explicitly align the size in bytecode_get_next_offset() and rename it accordingly. --- libs/vkd3d-shader/dxbc.c | 14 +++++++------- libs/vkd3d-shader/hlsl_sm1.c | 6 +++--- libs/vkd3d-shader/hlsl_sm4.c | 8 ++++---- libs/vkd3d-shader/vkd3d_shader_main.c | 18 ++++++++++++++++-- libs/vkd3d-shader/vkd3d_shader_private.h | 7 ++----- 5 files changed, 32 insertions(+), 21 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 6cc6b5d6..f32af8ea 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -57,7 +57,7 @@ int vkd3d_shader_serialize_dxbc(size_t section_count, const struct vkd3d_shader_ put_u32(&buffer, TAG_DXBC); - checksum_position = bytecode_get_next_offset(&buffer); + checksum_position = bytecode_get_size(&buffer); for (i = 0; i < 4; ++i) put_u32(&buffer, 0); @@ -65,13 +65,13 @@ int vkd3d_shader_serialize_dxbc(size_t section_count, const struct vkd3d_shader_ size_position = put_u32(&buffer, 0); put_u32(&buffer, section_count); - offsets_position = bytecode_get_next_offset(&buffer); + offsets_position = bytecode_get_size(&buffer); for (i = 0; i < section_count; ++i) put_u32(&buffer, 0); for (i = 0; i < section_count; ++i) { - set_u32(&buffer, offsets_position + i * sizeof(uint32_t), bytecode_get_next_offset(&buffer)); + set_u32(&buffer, offsets_position + i * sizeof(uint32_t), bytecode_align(&buffer)); put_u32(&buffer, sections[i].tag); put_u32(&buffer, sections[i].data.size); bytecode_put_bytes(&buffer, sections[i].data.code, sections[i].data.size); @@ -2754,7 +2754,7 @@ struct root_signature_writer_context static size_t get_chunk_offset(struct root_signature_writer_context *context) { - return bytecode_get_next_offset(&context->buffer) - context->chunk_position; + return bytecode_get_size(&context->buffer) - context->chunk_position; } static void shader_write_root_signature_header(struct root_signature_writer_context *context) @@ -2770,10 +2770,10 @@ static void shader_write_root_signature_header(struct root_signature_writer_cont put_u32(buffer, 1); context->total_size_position = put_u32(buffer, 0xffffffff); put_u32(buffer, 1); /* chunk count */ - put_u32(buffer, bytecode_get_next_offset(buffer) + sizeof(uint32_t)); /* chunk offset */ + put_u32(buffer, bytecode_get_size(buffer) + sizeof(uint32_t)); /* chunk offset */ put_u32(buffer, TAG_RTS0); put_u32(buffer, 0xffffffff); - context->chunk_position = bytecode_get_next_offset(buffer); + context->chunk_position = bytecode_get_size(buffer); } static void shader_write_descriptor_ranges(struct vkd3d_bytecode_buffer *buffer, @@ -2862,7 +2862,7 @@ static int shader_write_root_parameters(struct root_signature_writer_context *co size_t parameters_position; unsigned int i; - parameters_position = bytecode_get_next_offset(buffer); + parameters_position = bytecode_align(buffer); for (i = 0; i < parameter_count; ++i) { put_u32(buffer, versioned_root_signature_get_parameter_type(desc, i)); diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index be32c8db..606ecdd9 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -261,7 +261,7 @@ static void write_sm1_type(struct vkd3d_bytecode_buffer *buffer, struct hlsl_typ write_sm1_type(buffer, field->type, ctab_start); } - fields_offset = bytecode_get_next_offset(buffer) - ctab_start; + fields_offset = bytecode_align(buffer) - ctab_start; for (i = 0; i < field_count; ++i) { @@ -351,7 +351,7 @@ static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffe put_u32(buffer, 0); /* FIXME: flags */ put_u32(buffer, 0); /* FIXME: target string */ - vars_start = bytecode_get_next_offset(buffer); + vars_start = bytecode_align(buffer); LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { @@ -402,7 +402,7 @@ static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffe offset = put_string(buffer, vkd3d_shader_get_version(NULL, NULL)); set_u32(buffer, creator_offset, offset - ctab_start); - ctab_end = bytecode_get_next_offset(buffer); + ctab_end = bytecode_align(buffer); set_u32(buffer, size_offset, vkd3d_make_u32(D3DSIO_COMMENT, (ctab_end - ctab_offset) / sizeof(uint32_t))); } diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index dd95c308..65378f90 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -387,7 +387,7 @@ static void write_sm4_type(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b write_sm4_type(ctx, buffer, field->type); } - fields_offset = bytecode_get_next_offset(buffer); + fields_offset = bytecode_align(buffer); for (i = 0; i < field_count; ++i) { @@ -583,7 +583,7 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) /* Bound resources. */ - resources_offset = bytecode_get_next_offset(&buffer); + resources_offset = bytecode_align(&buffer); set_u32(&buffer, resource_position, resources_offset); for (i = 0; i < extern_resources_count; ++i) @@ -656,7 +656,7 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) /* Buffers. */ - cbuffers_offset = bytecode_get_next_offset(&buffer); + cbuffers_offset = bytecode_align(&buffer); set_u32(&buffer, cbuffer_position, cbuffers_offset); LIST_FOR_EACH_ENTRY(cbuffer, &ctx->buffers, struct hlsl_buffer, entry) { @@ -692,7 +692,7 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) i = 0; LIST_FOR_EACH_ENTRY(cbuffer, &ctx->buffers, struct hlsl_buffer, entry) { - size_t vars_start = bytecode_get_next_offset(&buffer); + size_t vars_start = bytecode_align(&buffer); if (!cbuffer->reg.allocated) continue; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 225bface..8728f974 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -340,9 +340,24 @@ void vkd3d_shader_error(struct vkd3d_shader_message_context *context, const stru va_end(args); } +size_t bytecode_align(struct vkd3d_bytecode_buffer *buffer) +{ + size_t aligned_size = align(buffer->size, 4); + + if (!vkd3d_array_reserve((void **)&buffer->data, &buffer->capacity, aligned_size, 1)) + { + buffer->status = VKD3D_ERROR_OUT_OF_MEMORY; + return aligned_size; + } + + memset(buffer->data + buffer->size, 0xab, aligned_size - buffer->size); + buffer->size = aligned_size; + return aligned_size; +} + size_t bytecode_put_bytes(struct vkd3d_bytecode_buffer *buffer, const void *bytes, size_t size) { - size_t offset = bytecode_get_next_offset(buffer); + size_t offset = bytecode_align(buffer); if (buffer->status) return offset; @@ -352,7 +367,6 @@ size_t bytecode_put_bytes(struct vkd3d_bytecode_buffer *buffer, const void *byte buffer->status = VKD3D_ERROR_OUT_OF_MEMORY; return offset; } - memset(buffer->data + buffer->size, 0xab, offset - buffer->size); memcpy(buffer->data + offset, bytes, size); buffer->size = offset + size; return offset; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index b048d5ef..7e111c42 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1071,6 +1071,8 @@ struct vkd3d_bytecode_buffer int status; }; +/* Align to the next 4-byte offset, and return that offset. */ +size_t bytecode_align(struct vkd3d_bytecode_buffer *buffer); size_t bytecode_put_bytes(struct vkd3d_bytecode_buffer *buffer, const void *bytes, size_t size); void set_u32(struct vkd3d_bytecode_buffer *buffer, size_t offset, uint32_t value); @@ -1094,11 +1096,6 @@ static inline size_t bytecode_get_size(struct vkd3d_bytecode_buffer *buffer) return buffer->size; } -static inline size_t bytecode_get_next_offset(struct vkd3d_bytecode_buffer *buffer) -{ - return align(buffer->size, 4); -} - uint32_t vkd3d_parse_integer(const char *s); struct vkd3d_shader_message_context

1 0

Zebediah Figura : vkd3d-shader/spirv: Move spirv_compiler_destroy() to avoid forward declarations.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: vkd3d Branch: master Commit: 28774b3649cea6764cca2f084fe30692f0616988 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/28774b3649cea6764cca2f084fe30… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 21 19:50:00 2023 -0600 vkd3d-shader/spirv: Move spirv_compiler_destroy() to avoid forward declarations. --- libs/vkd3d-shader/spirv.c | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index e0b39420..9504b955 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2310,7 +2310,25 @@ static const char *spirv_compiler_get_entry_point_name(const struct spirv_compil return info && info->entry_point ? info->entry_point : "main"; } -static void spirv_compiler_destroy(struct spirv_compiler *compiler); +static void spirv_compiler_destroy(struct spirv_compiler *compiler) +{ + vkd3d_free(compiler->control_flow_info); + + vkd3d_free(compiler->output_info); + + vkd3d_free(compiler->push_constants); + vkd3d_free(compiler->descriptor_offset_ids); + + vkd3d_spirv_builder_free(&compiler->spirv_builder); + + rb_destroy(&compiler->symbol_table, vkd3d_symbol_free, NULL); + + vkd3d_free(compiler->spec_constants); + + vkd3d_string_buffer_cache_cleanup(&compiler->string_buffers); + + vkd3d_free(compiler); +} static struct spirv_compiler *spirv_compiler_create(const struct vkd3d_shader_version *shader_version, const struct vkd3d_shader_desc *shader_desc, const struct vkd3d_shader_compile_info *compile_info, @@ -9938,23 +9956,3 @@ int spirv_compile(struct vkd3d_shader_parser *parser, spirv_compiler_destroy(spirv_compiler); return ret; } - -static void spirv_compiler_destroy(struct spirv_compiler *compiler) -{ - vkd3d_free(compiler->control_flow_info); - - vkd3d_free(compiler->output_info); - - vkd3d_free(compiler->push_constants); - vkd3d_free(compiler->descriptor_offset_ids); - - vkd3d_spirv_builder_free(&compiler->spirv_builder); - - rb_destroy(&compiler->symbol_table, vkd3d_symbol_free, NULL); - - vkd3d_free(compiler->spec_constants); - - vkd3d_string_buffer_cache_cleanup(&compiler->string_buffers); - - vkd3d_free(compiler); -}

1 0

Zebediah Figura : vkd3d-shader/hlsl: Always align section sizes.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: vkd3d Branch: master Commit: 616c4bf51fe338e1abf96627f6ce52404d5f4d8b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/616c4bf51fe338e1abf96627f6ce5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Apr 5 17:01:52 2023 -0500 vkd3d-shader/hlsl: Always align section sizes. This fixes disassembly using native D3DDisassemble() of shaders generated with vkd3d-shader. Fixes: d6d9aab31c290d3dc7a67110ba2b0ac916377929 --- libs/vkd3d-shader/hlsl_sm4.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 65378f90..5bd4f2d6 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -147,6 +147,16 @@ bool hlsl_sm4_usage_from_semantic(struct hlsl_ctx *ctx, const struct hlsl_semant return true; } +static void add_section(struct dxbc_writer *dxbc, uint32_t tag, struct vkd3d_bytecode_buffer *buffer) +{ + /* Native D3DDisassemble() expects at least the sizes of the ISGN and OSGN + * sections to be aligned. Without this, the sections themselves will be + * aligned, but their reported sizes won't. */ + size_t size = bytecode_align(buffer); + + dxbc_writer_add_section(dxbc, tag, buffer->data, size); +} + static void write_sm4_signature(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc, bool output) { struct vkd3d_bytecode_buffer buffer = {0}; @@ -252,7 +262,7 @@ static void write_sm4_signature(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc, set_u32(&buffer, count_position, i); - dxbc_writer_add_section(dxbc, output ? TAG_OSGN : TAG_ISGN, buffer.data, buffer.size); + add_section(dxbc, output ? TAG_OSGN : TAG_ISGN, &buffer); } static const struct hlsl_type *get_array_type(const struct hlsl_type *type) @@ -745,7 +755,7 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) creator_offset = put_string(&buffer, vkd3d_shader_get_version(NULL, NULL)); set_u32(&buffer, creator_position, creator_offset); - dxbc_writer_add_section(dxbc, TAG_RDEF, buffer.data, buffer.size); + add_section(dxbc, TAG_RDEF, &buffer); vkd3d_free(extern_resources); } @@ -2502,7 +2512,7 @@ static void write_sm4_shdr(struct hlsl_ctx *ctx, set_u32(&buffer, token_count_position, bytecode_get_size(&buffer) / sizeof(uint32_t)); - dxbc_writer_add_section(dxbc, TAG_SHDR, buffer.data, buffer.size); + add_section(dxbc, TAG_SHDR, &buffer); vkd3d_free(extern_resources); }

1 0

Zebediah Figura : vkd3d-shader: Factor out vkd3d_shader_parser_compile().
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: vkd3d Branch: master Commit: 09cda98deb18dd331655a18b2986e607e7930fdb URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/09cda98deb18dd331655a18b2986e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Mar 12 16:53:39 2022 -0600 vkd3d-shader: Factor out vkd3d_shader_parser_compile(). --- libs/vkd3d-shader/vkd3d_shader_main.c | 79 +++++++++++++++++++---------------- 1 file changed, 43 insertions(+), 36 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 11e32ab0..225bface 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1168,66 +1168,73 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char return ret; } -static int compile_dxbc_tpf(const struct vkd3d_shader_compile_info *compile_info, +static int vkd3d_shader_parser_compile(struct vkd3d_shader_parser *parser, + const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context) { struct vkd3d_shader_scan_descriptor_info scan_descriptor_info; + struct vkd3d_glsl_generator *glsl_generator; struct vkd3d_shader_compile_info scan_info; - struct vkd3d_shader_parser *parser; int ret; + vkd3d_shader_dump_shader(compile_info->source_type, parser->shader_version.type, &compile_info->source); + scan_info = *compile_info; scan_descriptor_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SCAN_DESCRIPTOR_INFO; scan_descriptor_info.next = scan_info.next; scan_info.next = &scan_descriptor_info; - if ((ret = vkd3d_shader_sm4_parser_create(compile_info, message_context, &parser)) < 0) - { - WARN("Failed to initialise shader parser.\n"); - return ret; - } - - vkd3d_shader_dump_shader(compile_info->source_type, parser->shader_version.type, &compile_info->source); - if ((ret = scan_with_parser(&scan_info, message_context, parser)) < 0) - { - vkd3d_shader_parser_destroy(parser); return ret; - } - if (compile_info->target_type == VKD3D_SHADER_TARGET_D3D_ASM) + switch (compile_info->target_type) { - vkd3d_shader_free_scan_descriptor_info(&scan_descriptor_info); - ret = vkd3d_dxbc_binary_to_text(&parser->instructions, &parser->shader_version, compile_info, out); - vkd3d_shader_parser_destroy(parser); - return ret; - } + case VKD3D_SHADER_TARGET_D3D_ASM: + ret = vkd3d_dxbc_binary_to_text(&parser->instructions, &parser->shader_version, compile_info, out); + break; - if (compile_info->target_type == VKD3D_SHADER_TARGET_GLSL) - { - struct vkd3d_glsl_generator *glsl_generator; + case VKD3D_SHADER_TARGET_GLSL: + if (!(glsl_generator = vkd3d_glsl_generator_create(&parser->shader_version, + message_context, &parser->location))) + { + ERR("Failed to create GLSL generator.\n"); + vkd3d_shader_free_scan_descriptor_info(&scan_descriptor_info); + return VKD3D_ERROR; + } - if (!(glsl_generator = vkd3d_glsl_generator_create(&parser->shader_version, - message_context, &parser->location))) - { - ERR("Failed to create GLSL generator.\n"); - vkd3d_shader_parser_destroy(parser); - vkd3d_shader_free_scan_descriptor_info(&scan_descriptor_info); - return VKD3D_ERROR; - } + ret = vkd3d_glsl_generator_generate(glsl_generator, parser, out); + vkd3d_glsl_generator_destroy(glsl_generator); + break; - ret = vkd3d_glsl_generator_generate(glsl_generator, parser, out); + case VKD3D_SHADER_TARGET_SPIRV_BINARY: + case VKD3D_SHADER_TARGET_SPIRV_TEXT: + ret = spirv_compile(parser, &scan_descriptor_info, compile_info, out, message_context); + break; - vkd3d_glsl_generator_destroy(glsl_generator); - vkd3d_shader_parser_destroy(parser); - vkd3d_shader_free_scan_descriptor_info(&scan_descriptor_info); + default: + /* Validation should prevent us from reaching this. */ + assert(0); + } + + vkd3d_shader_free_scan_descriptor_info(&scan_descriptor_info); + return ret; +} + +static int compile_dxbc_tpf(const struct vkd3d_shader_compile_info *compile_info, + struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context) +{ + struct vkd3d_shader_parser *parser; + int ret; + + if ((ret = vkd3d_shader_sm4_parser_create(compile_info, message_context, &parser)) < 0) + { + WARN("Failed to initialise shader parser.\n"); return ret; } - ret = spirv_compile(parser, &scan_descriptor_info, compile_info, out, message_context); + ret = vkd3d_shader_parser_compile(parser, compile_info, out, message_context); vkd3d_shader_parser_destroy(parser); - vkd3d_shader_free_scan_descriptor_info(&scan_descriptor_info); return ret; }

1 0

Zebediah Figura : vkd3d-shader/spirv: Introduce a spirv_compile() helper.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: vkd3d Branch: master Commit: 70cfd58be6e012fc36016ab34edce7c5c6c863b1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/70cfd58be6e012fc36016ab34edce… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Aug 6 18:39:40 2022 -0500 vkd3d-shader/spirv: Introduce a spirv_compile() helper. --- libs/vkd3d-shader/spirv.c | 29 ++++++++++++++++++++++++++--- libs/vkd3d-shader/vkd3d_shader_main.c | 13 +------------ libs/vkd3d-shader/vkd3d_shader_private.h | 12 +++--------- 3 files changed, 30 insertions(+), 24 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index ddd77ffb..e0b39420 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2310,7 +2310,9 @@ static const char *spirv_compiler_get_entry_point_name(const struct spirv_compil return info && info->entry_point ? info->entry_point : "main"; } -struct spirv_compiler *spirv_compiler_create(const struct vkd3d_shader_version *shader_version, +static void spirv_compiler_destroy(struct spirv_compiler *compiler); + +static struct spirv_compiler *spirv_compiler_create(const struct vkd3d_shader_version *shader_version, const struct vkd3d_shader_desc *shader_desc, const struct vkd3d_shader_compile_info *compile_info, const struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info, struct vkd3d_shader_message_context *message_context, const struct vkd3d_shader_location *location) @@ -9823,7 +9825,7 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, return ret; } -int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, +static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_parser *parser, struct vkd3d_shader_code *spirv) { @@ -9916,7 +9918,28 @@ int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, return VKD3D_OK; } -void spirv_compiler_destroy(struct spirv_compiler *compiler) +int spirv_compile(struct vkd3d_shader_parser *parser, + const struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info, + const struct vkd3d_shader_compile_info *compile_info, + struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context) +{ + struct spirv_compiler *spirv_compiler; + int ret; + + if (!(spirv_compiler = spirv_compiler_create(&parser->shader_version, &parser->shader_desc, + compile_info, scan_descriptor_info, message_context, &parser->location))) + { + ERR("Failed to create SPIR-V compiler.\n"); + return VKD3D_ERROR; + } + + ret = spirv_compiler_generate_spirv(spirv_compiler, compile_info, parser, out); + + spirv_compiler_destroy(spirv_compiler); + return ret; +} + +static void spirv_compiler_destroy(struct spirv_compiler *compiler) { vkd3d_free(compiler->control_flow_info); diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 732d1cdc..b2b885aa 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1173,7 +1173,6 @@ static int compile_dxbc_tpf(const struct vkd3d_shader_compile_info *compile_info { struct vkd3d_shader_scan_descriptor_info scan_descriptor_info; struct vkd3d_shader_compile_info scan_info; - struct spirv_compiler *spirv_compiler; struct vkd3d_shader_parser *parser; int ret; @@ -1223,18 +1222,8 @@ static int compile_dxbc_tpf(const struct vkd3d_shader_compile_info *compile_info return ret; } - if (!(spirv_compiler = spirv_compiler_create(&parser->shader_version, &parser->shader_desc, - compile_info, &scan_descriptor_info, message_context, &parser->location))) - { - ERR("Failed to create DXBC compiler.\n"); - vkd3d_shader_parser_destroy(parser); - vkd3d_shader_free_scan_descriptor_info(&scan_descriptor_info); - return VKD3D_ERROR; - } - - ret = spirv_compiler_generate_spirv(spirv_compiler, compile_info, parser, out); + ret = spirv_compile(parser, &scan_descriptor_info, compile_info, out, message_context); - spirv_compiler_destroy(spirv_compiler); vkd3d_shader_parser_destroy(parser); vkd3d_shader_free_scan_descriptor_info(&scan_descriptor_info); return ret; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index e2891de2..b048d5ef 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1150,16 +1150,10 @@ 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, - const struct vkd3d_shader_desc *shader_desc, const struct vkd3d_shader_compile_info *compile_info, +int spirv_compile(struct vkd3d_shader_parser *parser, const struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info, - struct vkd3d_shader_message_context *message_context, const struct vkd3d_shader_location *location); -int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, - const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_parser *parser, - struct vkd3d_shader_code *spirv); -void spirv_compiler_destroy(struct spirv_compiler *compiler); + const struct vkd3d_shader_compile_info *compile_info, + struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context); void vkd3d_compute_dxbc_checksum(const void *dxbc, size_t size, uint32_t checksum[4]);

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Add support for ternary operator.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: vkd3d Branch: master Commit: c190c184ce88fb5f2ac5d4c289cbf5f1799e453b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c190c184ce88fb5f2ac5d4c289cbf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 3 23:15:00 2023 +0200 vkd3d-shader/hlsl: Add support for ternary operator. --- Makefile.am | 1 + libs/vkd3d-shader/hlsl.y | 11 ++++++++++- tests/hlsl-ternary.shader_test | 15 +++++++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 77f44568..48991982 100644 --- a/Makefile.am +++ b/Makefile.am @@ -116,6 +116,7 @@ vkd3d_shader_tests = \ tests/hlsl-struct-array.shader_test \ tests/hlsl-struct-assignment.shader_test \ tests/hlsl-struct-semantics.shader_test \ + tests/hlsl-ternary.shader_test \ tests/hlsl-transpose.shader_test \ tests/hlsl-type-names.shader_test \ tests/hlsl-vector-indexing.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 24108959..3873a939 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -5743,7 +5743,16 @@ conditional_expr: logicor_expr | logicor_expr '?' expr ':' assignment_expr { - hlsl_fixme(ctx, &@$, "Ternary operator."); + struct hlsl_ir_node *cond = node_from_list($1), *first = node_from_list($3), *second = node_from_list($5); + + list_move_tail($1, $3); + list_move_tail($1, $5); + vkd3d_free($3); + vkd3d_free($5); + + if (!hlsl_add_conditional(ctx, $1, cond, first, second)) + YYABORT; + $$ = $1; } assignment_expr: diff --git a/tests/hlsl-ternary.shader_test b/tests/hlsl-ternary.shader_test new file mode 100644 index 00000000..d6097165 --- /dev/null +++ b/tests/hlsl-ternary.shader_test @@ -0,0 +1,15 @@ +[pixel shader] +uniform float4 x; + +float4 main() : SV_TARGET +{ + return x.x ? x : x - 1; +} + +[test] +uniform 0 float4 2.0 3.0 4.0 5.0 +draw quad +probe all rgba (2.0, 3.0, 4.0, 5.0) +uniform 0 float4 0.0 10.0 11.0 12.0 +draw quad +probe all rgba (-1.0, 9.0, 10.0, 11.0)

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Treat half as float for casts.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: vkd3d Branch: master Commit: 24c1eb562f1493f60e6e93514b2ef09494cdd43b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/24c1eb562f1493f60e6e93514b2ef… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 5 00:09:55 2023 +0200 vkd3d-shader/hlsl: Treat half as float for casts. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_sm4.c | 5 +---- tests/cast-to-half.shader_test | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 8551cfd8..dd95c308 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1581,6 +1581,7 @@ static void write_sm4_cast(struct hlsl_ctx *ctx, switch (dst_type->base_type) { + case HLSL_TYPE_HALF: case HLSL_TYPE_FLOAT: switch (src_type->base_type) { @@ -1662,10 +1663,6 @@ static void write_sm4_cast(struct hlsl_ctx *ctx, } break; - case HLSL_TYPE_HALF: - hlsl_fixme(ctx, &expr->node.loc, "SM4 cast to half."); - break; - case HLSL_TYPE_DOUBLE: hlsl_fixme(ctx, &expr->node.loc, "SM4 cast to double."); break; diff --git a/tests/cast-to-half.shader_test b/tests/cast-to-half.shader_test index e2b66d4b..81d6bc5d 100644 --- a/tests/cast-to-half.shader_test +++ b/tests/cast-to-half.shader_test @@ -1,7 +1,7 @@ [require] shader model >= 4.0 -[pixel shader todo] +[pixel shader] float4 main(uniform int i, uniform uint u, uniform bool b, uniform float f) : sv_target { @@ -13,7 +13,7 @@ uniform 0 int -1 uniform 1 uint 3 uniform 2 int -2 uniform 3 float 0.5 -todo draw quad +draw quad probe all rgba (0.5, 0.5, 0.5, 0.5) [pixel shader]

1 0

Zebediah Figura : vkd3d-shader/hlsl: Introduce an hlsl_block_init() helper.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: vkd3d Branch: master Commit: 725d4089748d6dda618347fc4a07344c8045e30f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/725d4089748d6dda618347fc4a073… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 16 17:52:15 2023 -0600 vkd3d-shader/hlsl: Introduce an hlsl_block_init() helper. --- libs/vkd3d-shader/hlsl.c | 14 +++++++------- libs/vkd3d-shader/hlsl.h | 5 +++++ libs/vkd3d-shader/hlsl_codegen.c | 6 +++--- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 09ec2f8e..54f3292b 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -461,7 +461,7 @@ static bool init_deref_from_component_index(struct hlsl_ctx *ctx, struct hlsl_bl struct hlsl_type *path_type; struct hlsl_ir_constant *c; - list_init(&block->instrs); + hlsl_block_init(block); path_len = 0; path_type = hlsl_deref_get_type(ctx, prefix); @@ -1012,7 +1012,7 @@ struct hlsl_ir_store *hlsl_new_store_component(struct hlsl_ctx *ctx, struct hlsl struct hlsl_block comp_path_block; struct hlsl_ir_store *store; - list_init(&block->instrs); + hlsl_block_init(block); if (!(store = hlsl_alloc(ctx, sizeof(*store)))) return NULL; @@ -1150,8 +1150,8 @@ struct hlsl_ir_if *hlsl_new_if(struct hlsl_ctx *ctx, struct hlsl_ir_node *condit return NULL; init_node(&iff->node, HLSL_IR_IF, NULL, &loc); hlsl_src_from_node(&iff->condition, condition); - list_init(&iff->then_instrs.instrs); - list_init(&iff->else_instrs.instrs); + hlsl_block_init(&iff->then_instrs); + hlsl_block_init(&iff->else_instrs); return iff; } @@ -1201,7 +1201,7 @@ struct hlsl_ir_load *hlsl_new_load_component(struct hlsl_ctx *ctx, struct hlsl_b struct hlsl_block comp_path_block; struct hlsl_ir_load *load; - list_init(&block->instrs); + hlsl_block_init(block); if (!(load = hlsl_alloc(ctx, sizeof(*load)))) return NULL; @@ -1298,7 +1298,7 @@ struct hlsl_ir_loop *hlsl_new_loop(struct hlsl_ctx *ctx, struct vkd3d_shader_loc if (!(loop = hlsl_alloc(ctx, sizeof(*loop)))) return NULL; init_node(&loop->node, HLSL_IR_LOOP, NULL, &loc); - list_init(&loop->body.instrs); + hlsl_block_init(&loop->body); return loop; } @@ -1601,7 +1601,7 @@ struct hlsl_ir_function_decl *hlsl_new_func_decl(struct hlsl_ctx *ctx, if (!(decl = hlsl_alloc(ctx, sizeof(*decl)))) return NULL; - list_init(&decl->body.instrs); + hlsl_block_init(&decl->body); decl->return_type = return_type; decl->parameters = *parameters; decl->loc = *loc; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 6c8b8da3..3e631dd9 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -857,6 +857,11 @@ static inline struct hlsl_ir_swizzle *hlsl_ir_swizzle(const struct hlsl_ir_node return CONTAINING_RECORD(node, struct hlsl_ir_swizzle, node); } +static inline void hlsl_block_init(struct hlsl_block *block) +{ + list_init(&block->instrs); +} + static inline void hlsl_block_add_instr(struct hlsl_block *block, struct hlsl_ir_node *instr) { list_add_tail(&block->instrs, &instr->entry); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index c95ce2d8..c8550b65 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -29,7 +29,7 @@ static struct hlsl_ir_node *new_offset_from_path_index(struct hlsl_ctx *ctx, str struct hlsl_ir_node *idx_offset = NULL; struct hlsl_ir_constant *c; - list_init(&block->instrs); + hlsl_block_init(block); switch (type->class) { @@ -101,7 +101,7 @@ static struct hlsl_ir_node *new_offset_instr_from_deref(struct hlsl_ctx *ctx, st struct hlsl_type *type; unsigned int i; - list_init(&block->instrs); + hlsl_block_init(block); assert(deref->var); type = deref->var->data_type; @@ -721,7 +721,7 @@ static bool lower_calls(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void * hlsl_error(ctx, &call->node.loc, VKD3D_SHADER_ERROR_HLSL_NOT_DEFINED, "Function \"%s\" is not defined.", decl->func->name); - list_init(&block.instrs); + hlsl_block_init(&block); if (!hlsl_clone_block(ctx, &block, &decl->body)) return false; list_move_before(&call->node.entry, &block.instrs);

1 0