wine-commits January 2023

wine-commits@winehq.org

1 participants
467 discussions

Conor McCarthy : vkd3d-shader/sm4: Use the instruction array interface in compile_dxbc_tpf().
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: vkd3d Branch: master Commit: 2a5ae0a8c646c48aed0b8bbe447dc0db2bd41c7d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2a5ae0a8c646c48aed0b8bbe447dc… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Jan 20 12:44:18 2023 +1000 vkd3d-shader/sm4: Use the instruction array interface in compile_dxbc_tpf(). --- libs/vkd3d-shader/d3dbc.c | 2 -- libs/vkd3d-shader/dxbc.c | 2 -- libs/vkd3d-shader/vkd3d_shader_main.c | 29 +++-------------------------- libs/vkd3d-shader/vkd3d_shader_private.h | 15 --------------- 4 files changed, 3 insertions(+), 45 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 5f11667b..ed81137d 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -874,8 +874,6 @@ static bool shader_sm1_is_end(struct vkd3d_shader_parser *parser) const struct vkd3d_shader_parser_ops shader_sm1_parser_ops = { .parser_destroy = shader_sm1_destroy, - .parser_read_instruction = shader_parser_read_instruction, - .parser_is_end = shader_parser_is_end, }; static enum vkd3d_result shader_sm1_init(struct vkd3d_shader_sm1_parser *sm1, diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 39fbdcc6..4041e0f5 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1588,8 +1588,6 @@ static bool shader_sm4_is_end(struct vkd3d_shader_parser *parser) static const struct vkd3d_shader_parser_ops shader_sm4_parser_ops = { .parser_destroy = shader_sm4_destroy, - .parser_read_instruction = shader_parser_read_instruction, - .parser_is_end = shader_parser_is_end, }; static bool shader_sm4_init(struct vkd3d_shader_sm4_parser *sm4, const uint32_t *byte_code, diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 8c50e193..012b3eb6 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -463,16 +463,6 @@ void VKD3D_PRINTF_FUNC(3, 4) vkd3d_shader_parser_warning(struct vkd3d_shader_par va_end(args); } -void shader_parser_read_instruction(struct vkd3d_shader_parser *parser, struct vkd3d_shader_instruction *ins) -{ - *ins = parser->instructions.elements[parser->instruction_idx++]; -} - -bool shader_parser_is_end(struct vkd3d_shader_parser *parser) -{ - return parser->instruction_idx >= parser->instructions.count; -} - static int vkd3d_shader_validate_compile_info(const struct vkd3d_shader_compile_info *compile_info, bool validate_target_type) { @@ -1183,10 +1173,10 @@ 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_scan_descriptor_info scan_descriptor_info; - struct vkd3d_shader_instruction instruction; struct vkd3d_shader_compile_info scan_info; struct spirv_compiler *spirv_compiler; struct vkd3d_shader_parser *parser; + unsigned int i; int ret; scan_info = *compile_info; @@ -1244,24 +1234,11 @@ static int compile_dxbc_tpf(const struct vkd3d_shader_compile_info *compile_info return VKD3D_ERROR; } - while (!vkd3d_shader_parser_is_end(parser)) + for (i = 0; i < parser->instructions.count && ret >= 0; ++i) { - vkd3d_shader_parser_read_instruction(parser, &instruction); - - if (instruction.handler_idx == VKD3DSIH_INVALID) - { - WARN("Encountered unrecognized or invalid instruction.\n"); - ret = VKD3D_ERROR_INVALID_SHADER; - break; - } - - if ((ret = spirv_compiler_handle_instruction(spirv_compiler, &instruction)) < 0) - break; + ret = spirv_compiler_handle_instruction(spirv_compiler, &parser->instructions.elements[i]); } - if (parser->failed) - ret = VKD3D_ERROR_INVALID_SHADER; - if (ret >= 0) ret = spirv_compiler_generate_spirv(spirv_compiler, compile_info, out); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 1baa7f7f..b5f45834 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -997,8 +997,6 @@ struct vkd3d_shader_parser struct vkd3d_shader_parser_ops { void (*parser_destroy)(struct vkd3d_shader_parser *parser); - void (*parser_read_instruction)(struct vkd3d_shader_parser *parser, struct vkd3d_shader_instruction *instruction); - bool (*parser_is_end)(struct vkd3d_shader_parser *parser); }; void vkd3d_shader_parser_error(struct vkd3d_shader_parser *parser, @@ -1009,8 +1007,6 @@ bool vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser, unsigned int instruction_reserve); void vkd3d_shader_parser_warning(struct vkd3d_shader_parser *parser, enum vkd3d_shader_error error, const char *format, ...) VKD3D_PRINTF_FUNC(3, 4); -void shader_parser_read_instruction(struct vkd3d_shader_parser *parser, struct vkd3d_shader_instruction *ins); -bool shader_parser_is_end(struct vkd3d_shader_parser *parser); static inline struct vkd3d_shader_dst_param *shader_parser_get_dst_params( struct vkd3d_shader_parser *parser, unsigned int count) @@ -1029,17 +1025,6 @@ static inline void vkd3d_shader_parser_destroy(struct vkd3d_shader_parser *parse parser->ops->parser_destroy(parser); } -static inline bool vkd3d_shader_parser_is_end(struct vkd3d_shader_parser *parser) -{ - return parser->ops->parser_is_end(parser); -} - -static inline void vkd3d_shader_parser_read_instruction(struct vkd3d_shader_parser *parser, - struct vkd3d_shader_instruction *instruction) -{ - parser->ops->parser_read_instruction(parser, instruction); -} - void vkd3d_shader_trace(struct vkd3d_shader_parser *parser); const char *shader_get_type_prefix(enum vkd3d_shader_type type);

1 0

Conor McCarthy : vkd3d-shader/glsl: Use the instruction array interface in vkd3d_glsl_generator_generate().
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: vkd3d Branch: master Commit: 2d3f05184fb9014222c6aecd6de5195ea5095fe3 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2d3f05184fb9014222c6aecd6de51… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Jan 20 12:24:20 2023 +1000 vkd3d-shader/glsl: Use the instruction array interface in vkd3d_glsl_generator_generate(). --- libs/vkd3d-shader/glsl.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/libs/vkd3d-shader/glsl.c b/libs/vkd3d-shader/glsl.c index 56fa7043..1fe3f258 100644 --- a/libs/vkd3d-shader/glsl.c +++ b/libs/vkd3d-shader/glsl.c @@ -93,28 +93,18 @@ static void vkd3d_glsl_handle_instruction(struct vkd3d_glsl_generator *generator int vkd3d_glsl_generator_generate(struct vkd3d_glsl_generator *generator, struct vkd3d_shader_parser *parser, struct vkd3d_shader_code *out) { + unsigned int i; void *code; - struct vkd3d_shader_instruction ins; vkd3d_string_buffer_printf(&generator->buffer, "#version 440\n\n"); vkd3d_string_buffer_printf(&generator->buffer, "void main()\n{\n"); - while (!vkd3d_shader_parser_is_end(parser)) + for (i = 0; i < parser->instructions.count; ++i) { - vkd3d_shader_parser_read_instruction(parser, &ins); - - if (ins.handler_idx == VKD3DSIH_INVALID) - { - vkd3d_glsl_compiler_error(generator, - VKD3D_SHADER_ERROR_GLSL_INTERNAL, - "Encountered unrecognized or invalid instruction."); - break; - } - - vkd3d_glsl_handle_instruction(generator, &ins); + vkd3d_glsl_handle_instruction(generator, &parser->instructions.elements[i]); } - if (parser->failed || generator->failed) + if (generator->failed) return VKD3D_ERROR_INVALID_SHADER; vkd3d_string_buffer_printf(&generator->buffer, "}\n");

1 0

Conor McCarthy : vkd3d-shader: Use the instruction array interface in scan_with_parser().
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: vkd3d Branch: master Commit: 2559d622de2672a813af0a1b91dbbb9df29ed827 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2559d622de2672a813af0a1b91dbb… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Jan 20 12:23:27 2023 +1000 vkd3d-shader: Use the instruction array interface in scan_with_parser(). --- libs/vkd3d-shader/vkd3d_shader_main.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index fc7ccbf8..8c50e193 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1067,9 +1067,10 @@ static int scan_with_parser(const struct vkd3d_shader_compile_info *compile_info struct vkd3d_shader_message_context *message_context, struct vkd3d_shader_parser *parser) { struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info; - struct vkd3d_shader_instruction instruction; + struct vkd3d_shader_instruction *instruction; struct vkd3d_shader_scan_context context; - int ret; + int ret = VKD3D_OK; + unsigned int i; if ((scan_descriptor_info = vkd3d_find_struct(compile_info->next, SCAN_DESCRIPTOR_INFO))) { @@ -1084,30 +1085,17 @@ static int scan_with_parser(const struct vkd3d_shader_compile_info *compile_info vkd3d_shader_trace(parser); } - while (!vkd3d_shader_parser_is_end(parser)) + for (i = 0; i < parser->instructions.count; ++i) { - vkd3d_shader_parser_read_instruction(parser, &instruction); - - if (instruction.handler_idx == VKD3DSIH_INVALID) - { - WARN("Encountered unrecognized or invalid instruction.\n"); - if (scan_descriptor_info) - vkd3d_shader_free_scan_descriptor_info(scan_descriptor_info); - ret = VKD3D_ERROR_INVALID_SHADER; - goto done; - } - - if ((ret = vkd3d_shader_scan_instruction(&context, &instruction)) < 0) + instruction = &parser->instructions.elements[i]; + if ((ret = vkd3d_shader_scan_instruction(&context, instruction)) < 0) { if (scan_descriptor_info) vkd3d_shader_free_scan_descriptor_info(scan_descriptor_info); - goto done; + break; } } - ret = parser->failed ? VKD3D_ERROR_INVALID_SHADER : VKD3D_OK; - -done: vkd3d_shader_scan_context_cleanup(&context); return ret; }

1 0

Conor McCarthy : vkd3d-shader/trace: Use the instruction array interface in vkd3d_dxbc_binary_to_text().
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: vkd3d Branch: master Commit: e9a2642d6af4a9013c883e8b4c5180deee92ac10 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e9a2642d6af4a9013c883e8b4c518… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Jan 20 12:08:22 2023 +1000 vkd3d-shader/trace: Use the instruction array interface in vkd3d_dxbc_binary_to_text(). --- libs/vkd3d-shader/d3dbc.c | 1 - libs/vkd3d-shader/dxbc.c | 1 - libs/vkd3d-shader/trace.c | 27 +++++++-------------------- libs/vkd3d-shader/vkd3d_shader_main.c | 7 ------- libs/vkd3d-shader/vkd3d_shader_private.h | 7 ------- 5 files changed, 7 insertions(+), 36 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 074c7aeb..5f11667b 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -873,7 +873,6 @@ static bool shader_sm1_is_end(struct vkd3d_shader_parser *parser) const struct vkd3d_shader_parser_ops shader_sm1_parser_ops = { - .parser_reset = shader_parser_reset, .parser_destroy = shader_sm1_destroy, .parser_read_instruction = shader_parser_read_instruction, .parser_is_end = shader_parser_is_end, diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index a6cfc1dd..39fbdcc6 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1587,7 +1587,6 @@ static bool shader_sm4_is_end(struct vkd3d_shader_parser *parser) static const struct vkd3d_shader_parser_ops shader_sm4_parser_ops = { - .parser_reset = shader_parser_reset, .parser_destroy = shader_sm4_destroy, .parser_read_instruction = shader_parser_read_instruction, .parser_is_end = shader_parser_is_end, diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 6c30edc9..8e2cac16 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1859,7 +1859,7 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(struct vkd3d_shader_parser *parser, struct vkd3d_d3d_asm_compiler compiler; enum vkd3d_result result = VKD3D_OK; struct vkd3d_string_buffer *buffer; - unsigned int indent, i; + unsigned int indent, i, j; const char *indent_str; void *code; @@ -1920,21 +1920,11 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(struct vkd3d_shader_parser *parser, shader_version->minor, compiler.colours.reset); indent = 0; - vkd3d_shader_parser_reset(parser); - while (!vkd3d_shader_parser_is_end(parser)) + for (i = 0; i < parser->instructions.count; ++i) { - struct vkd3d_shader_instruction ins; + struct vkd3d_shader_instruction *ins = &parser->instructions.elements[i]; - vkd3d_shader_parser_read_instruction(parser, &ins); - if (ins.handler_idx == VKD3DSIH_INVALID) - { - WARN("Skipping unrecognized instruction.\n"); - vkd3d_string_buffer_printf(buffer, "<unrecognized instruction>\n"); - result = VKD3D_ERROR; - continue; - } - - switch (ins.handler_idx) + switch (ins->handler_idx) { case VKD3DSIH_ELSE: case VKD3DSIH_ENDIF: @@ -1947,14 +1937,14 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(struct vkd3d_shader_parser *parser, break; } - for (i = 0; i < indent; ++i) + for (j = 0; j < indent; ++j) { vkd3d_string_buffer_printf(buffer, "%s", indent_str); } - shader_dump_instruction(&compiler, &ins); + shader_dump_instruction(&compiler, ins); - switch (ins.handler_idx) + switch (ins->handler_idx) { case VKD3DSIH_ELSE: case VKD3DSIH_IF: @@ -1968,9 +1958,6 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(struct vkd3d_shader_parser *parser, } } - if (parser->failed) - result = VKD3D_ERROR_INVALID_SHADER; - if ((code = vkd3d_malloc(buffer->content_size))) { memcpy(code, buffer->buffer, buffer->content_size); diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 973af3df..fc7ccbf8 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -463,12 +463,6 @@ void VKD3D_PRINTF_FUNC(3, 4) vkd3d_shader_parser_warning(struct vkd3d_shader_par va_end(args); } -void shader_parser_reset(struct vkd3d_shader_parser *parser) -{ - parser->instruction_idx = 0; - parser->failed = false; -} - void shader_parser_read_instruction(struct vkd3d_shader_parser *parser, struct vkd3d_shader_instruction *ins) { *ins = parser->instructions.elements[parser->instruction_idx++]; @@ -1088,7 +1082,6 @@ static int scan_with_parser(const struct vkd3d_shader_compile_info *compile_info if (TRACE_ON()) { vkd3d_shader_trace(parser); - vkd3d_shader_parser_reset(parser); } while (!vkd3d_shader_parser_is_end(parser)) diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 2c70b5c1..1baa7f7f 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -996,7 +996,6 @@ struct vkd3d_shader_parser struct vkd3d_shader_parser_ops { - void (*parser_reset)(struct vkd3d_shader_parser *parser); void (*parser_destroy)(struct vkd3d_shader_parser *parser); void (*parser_read_instruction)(struct vkd3d_shader_parser *parser, struct vkd3d_shader_instruction *instruction); bool (*parser_is_end)(struct vkd3d_shader_parser *parser); @@ -1010,7 +1009,6 @@ bool vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser, unsigned int instruction_reserve); void vkd3d_shader_parser_warning(struct vkd3d_shader_parser *parser, enum vkd3d_shader_error error, const char *format, ...) VKD3D_PRINTF_FUNC(3, 4); -void shader_parser_reset(struct vkd3d_shader_parser *parser); void shader_parser_read_instruction(struct vkd3d_shader_parser *parser, struct vkd3d_shader_instruction *ins); bool shader_parser_is_end(struct vkd3d_shader_parser *parser); @@ -1042,11 +1040,6 @@ static inline void vkd3d_shader_parser_read_instruction(struct vkd3d_shader_pars parser->ops->parser_read_instruction(parser, instruction); } -static inline void vkd3d_shader_parser_reset(struct vkd3d_shader_parser *parser) -{ - parser->ops->parser_reset(parser); -} - void vkd3d_shader_trace(struct vkd3d_shader_parser *parser); const char *shader_get_type_prefix(enum vkd3d_shader_type type);

1 0

Conor McCarthy : vkd3d-shader: Initialise the instruction array in vkd3d_shader_parser_init().
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: vkd3d Branch: master Commit: e8cb90608d31612c00272449565ae4e442435325 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e8cb90608d31612c00272449565ae… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Jan 20 11:44:21 2023 +1000 vkd3d-shader: Initialise the instruction array in vkd3d_shader_parser_init(). --- libs/vkd3d-shader/d3dbc.c | 5 ++--- libs/vkd3d-shader/dxbc.c | 7 +++---- libs/vkd3d-shader/vkd3d_shader_main.c | 6 ++++-- libs/vkd3d-shader/vkd3d_shader_private.h | 5 +++-- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 89905869..074c7aeb 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -935,10 +935,9 @@ static enum vkd3d_result shader_sm1_init(struct vkd3d_shader_sm1_parser *sm1, sm1->end = &code[token_count]; /* Estimate instruction count to avoid reallocation in most shaders. */ - if (!shader_instruction_array_init(&sm1->p.instructions, code_size != ~(size_t)0 ? token_count / 4u + 4: 16)) + if (!vkd3d_shader_parser_init(&sm1->p, message_context, compile_info->source_name, &version, &shader_sm1_parser_ops, + code_size != ~(size_t)0 ? token_count / 4u + 4 : 16)) return VKD3D_ERROR_OUT_OF_MEMORY; - - vkd3d_shader_parser_init(&sm1->p, message_context, compile_info->source_name, &version, &shader_sm1_parser_ops); shader_desc = &sm1->p.shader_desc; shader_desc->byte_code = code; shader_desc->byte_code_size = code_size; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 390001c5..a6cfc1dd 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1654,10 +1654,9 @@ static bool shader_sm4_init(struct vkd3d_shader_sm4_parser *sm4, const uint32_t version.minor = VKD3D_SM4_VERSION_MINOR(version_token); /* Estimate instruction count to avoid reallocation in most shaders. */ - if (!shader_instruction_array_init(&sm4->p.instructions, token_count / 7u + 20)) - return VKD3D_ERROR_OUT_OF_MEMORY; - - vkd3d_shader_parser_init(&sm4->p, message_context, source_name, &version, &shader_sm4_parser_ops); + if (!vkd3d_shader_parser_init(&sm4->p, message_context, source_name, &version, &shader_sm4_parser_ops, + token_count / 7u + 20)) + return false; sm4->p.ptr = sm4->start; memset(sm4->output_map, 0xff, sizeof(sm4->output_map)); diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 275bcf28..973af3df 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -427,9 +427,10 @@ void vkd3d_shader_dump_shader(enum vkd3d_shader_source_type source_type, shader_get_source_type_suffix(source_type), shader->code, shader->size); } -void vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser, +bool vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser, struct vkd3d_shader_message_context *message_context, const char *source_name, - const struct vkd3d_shader_version *version, const struct vkd3d_shader_parser_ops *ops) + const struct vkd3d_shader_version *version, const struct vkd3d_shader_parser_ops *ops, + unsigned int instruction_reserve) { parser->message_context = message_context; parser->location.source_name = source_name; @@ -437,6 +438,7 @@ void vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser, parser->location.column = 0; parser->shader_version = *version; parser->ops = ops; + return shader_instruction_array_init(&parser->instructions, instruction_reserve); } void VKD3D_PRINTF_FUNC(3, 4) vkd3d_shader_parser_error(struct vkd3d_shader_parser *parser, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 5d89c243..2c70b5c1 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1004,9 +1004,10 @@ struct vkd3d_shader_parser_ops void vkd3d_shader_parser_error(struct vkd3d_shader_parser *parser, enum vkd3d_shader_error error, const char *format, ...) VKD3D_PRINTF_FUNC(3, 4); -void vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser, +bool vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser, struct vkd3d_shader_message_context *message_context, const char *source_name, - const struct vkd3d_shader_version *version, const struct vkd3d_shader_parser_ops *ops); + const struct vkd3d_shader_version *version, const struct vkd3d_shader_parser_ops *ops, + unsigned int instruction_reserve); void vkd3d_shader_parser_warning(struct vkd3d_shader_parser *parser, enum vkd3d_shader_error error, const char *format, ...) VKD3D_PRINTF_FUNC(3, 4); void shader_parser_reset(struct vkd3d_shader_parser *parser);

1 0

Conor McCarthy : vkd3d-shader/sm4: Store parsed instructions in an array.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: vkd3d Branch: master Commit: a9aaa59df0984e10c75e055d6827cbb5c553f5f1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a9aaa59df0984e10c75e055d6827c… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Jan 20 11:35:38 2023 +1000 vkd3d-shader/sm4: Store parsed instructions in an array. --- libs/vkd3d-shader/dxbc.c | 138 ++++++++++++++++--------------- libs/vkd3d-shader/vkd3d_shader_main.c | 15 ++++ libs/vkd3d-shader/vkd3d_shader_private.h | 9 +- 3 files changed, 95 insertions(+), 67 deletions(-)

1 0

Conor McCarthy : vkd3d-shader/sm1: Store parsed instructions in an array.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: vkd3d Branch: master Commit: 007f894b9493eb80091899dab971e369f1673a4f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/007f894b9493eb80091899dab971e… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Jan 20 11:13:01 2023 +1000 vkd3d-shader/sm1: Store parsed instructions in an array. --- libs/vkd3d-shader/d3dbc.c | 112 +++++++++++++++++++++---------- libs/vkd3d-shader/vkd3d_shader_main.c | 102 ++++++++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 63 +++++++++++++++++ 3 files changed, 241 insertions(+), 36 deletions(-)

1 0

Francisco Casas : vkd3d-shader/hlsl: Fold swizzle chains.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: vkd3d Branch: master Commit: 6b82ba9488fbf591b91a565c86308d47c8b94ff0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6b82ba9488fbf591b91a565c86308… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Dec 9 19:23:41 2022 -0300 vkd3d-shader/hlsl: Fold swizzle chains. --- libs/vkd3d-shader/hlsl_codegen.c | 34 +++++++++++++++++++++++++++++++++ tests/swizzle-constant-prop.shader_test | 12 ++++++------ 2 files changed, 40 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index c9a46e95..5e7cfff4 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1419,6 +1419,39 @@ static bool lower_narrowing_casts(struct hlsl_ctx *ctx, struct hlsl_ir_node *ins return false; } +static bool fold_swizzle_chains(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + struct hlsl_ir_swizzle *swizzle; + struct hlsl_ir_node *next_instr; + + if (instr->type != HLSL_IR_SWIZZLE) + return false; + swizzle = hlsl_ir_swizzle(instr); + + next_instr = swizzle->val.node; + + if (next_instr->type == HLSL_IR_SWIZZLE) + { + struct hlsl_ir_swizzle *new_swizzle; + struct hlsl_ir_node *new_instr; + unsigned int combined_swizzle; + + combined_swizzle = hlsl_combine_swizzles(hlsl_ir_swizzle(next_instr)->swizzle, + swizzle->swizzle, instr->data_type->dimx); + next_instr = hlsl_ir_swizzle(next_instr)->val.node; + + if (!(new_swizzle = hlsl_new_swizzle(ctx, combined_swizzle, instr->data_type->dimx, next_instr, &instr->loc))) + return false; + + new_instr = &new_swizzle->node; + list_add_before(&instr->entry, &new_instr->entry); + hlsl_replace_node(instr, new_instr); + return true; + } + + return false; +} + static bool remove_trivial_swizzles(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { struct hlsl_ir_swizzle *swizzle; @@ -2866,6 +2899,7 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry progress = transform_ir(ctx, hlsl_fold_constant_exprs, body, NULL); progress |= transform_ir(ctx, hlsl_fold_constant_swizzles, body, NULL); progress |= copy_propagation_execute(ctx, body); + progress |= transform_ir(ctx, fold_swizzle_chains, body, NULL); progress |= transform_ir(ctx, remove_trivial_swizzles, body, NULL); } while (progress); diff --git a/tests/swizzle-constant-prop.shader_test b/tests/swizzle-constant-prop.shader_test index 48c3ab79..357a3496 100644 --- a/tests/swizzle-constant-prop.shader_test +++ b/tests/swizzle-constant-prop.shader_test @@ -29,7 +29,7 @@ draw quad probe all rgba (110, 210, 410, 410) -[pixel shader todo] +[pixel shader] Texture2D tex; uniform int i; @@ -43,11 +43,11 @@ float4 main() : sv_target [test] uniform 0 int 3 -todo draw quad -todo probe all rgba (105, 5, 305, 305) +draw quad +probe all rgba (105, 5, 305, 305) -[pixel shader todo] +[pixel shader] Texture2D tex; uniform int i; @@ -59,5 +59,5 @@ float4 main() : sv_target [test] uniform 0 int 1 -todo draw quad -todo probe all rgba (14.0, 14.0, 14.0, 14.0) +draw quad +probe all rgba (14.0, 14.0, 14.0, 14.0)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Apply copy propagation to swizzled loads.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: vkd3d Branch: master Commit: b7d34e830776ec0709bd08afa2f740041fa86939 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b7d34e830776ec0709bd08afa2f74… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 12 17:26:03 2023 -0600 vkd3d-shader/hlsl: Apply copy propagation to swizzled loads. --- libs/vkd3d-shader/hlsl_codegen.c | 68 ++++++++++++++++++++++++--------- tests/swizzle-constant-prop.shader_test | 6 +-- 2 files changed, 52 insertions(+), 22 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index da5b4264..c9a46e95 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -556,6 +556,9 @@ static bool lower_broadcasts(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, v * store instructions, as long as the rhs is the same in every case. This basic * detection is implemented by copy_propagation_replace_with_single_instr(). * + * In some cases, the load itself might not have a single source, but a + * subsequent swizzle might; hence we also try to replace swizzles of loads. + * * We use the same infrastructure to implement a more specialized * transformation. We recognize sequences of the form: * @@ -770,11 +773,11 @@ static void copy_propagation_set_value(struct copy_propagation_var_def *var_def, } static bool copy_propagation_replace_with_single_instr(struct hlsl_ctx *ctx, - const struct copy_propagation_state *state, struct hlsl_ir_load *load) + const struct copy_propagation_state *state, const struct hlsl_deref *deref, + unsigned int swizzle, struct hlsl_ir_node *instr) { - const struct hlsl_deref *deref = &load->src; + const unsigned int instr_component_count = hlsl_type_component_count(instr->data_type); const struct hlsl_ir_var *var = deref->var; - struct hlsl_ir_node *instr = &load->node; struct hlsl_ir_node *new_instr = NULL; unsigned int start, count, i; unsigned int ret_swizzle = 0; @@ -782,11 +785,11 @@ static bool copy_propagation_replace_with_single_instr(struct hlsl_ctx *ctx, if (!hlsl_component_index_range_from_deref(ctx, deref, &start, &count)) return false; - for (i = 0; i < count; ++i) + for (i = 0; i < instr_component_count; ++i) { - struct copy_propagation_value *value = copy_propagation_get_value(state, var, start + i); + struct copy_propagation_value *value; - if (!value) + if (!(value = copy_propagation_get_value(state, var, start + hlsl_swizzle_get_component(swizzle, i)))) return false; if (!new_instr) @@ -795,14 +798,16 @@ static bool copy_propagation_replace_with_single_instr(struct hlsl_ctx *ctx, } else if (new_instr != value->node) { - TRACE("No single source for propagating load from %s[%u-%u].\n", var->name, start, start + count); + TRACE("No single source for propagating load from %s[%u-%u]%s\n", + var->name, start, start + count, debug_hlsl_swizzle(swizzle, instr_component_count)); return false; } ret_swizzle |= value->component << HLSL_SWIZZLE_SHIFT(i); } - TRACE("Load from %s[%u-%u] propagated as instruction %p%s.\n", - var->name, start, start + count, new_instr, debug_hlsl_swizzle(ret_swizzle, count)); + TRACE("Load from %s[%u-%u]%s propagated as instruction %p%s.\n", + var->name, start, start + count, debug_hlsl_swizzle(swizzle, instr_component_count), + new_instr, debug_hlsl_swizzle(ret_swizzle, instr_component_count)); if (instr->data_type->type != HLSL_CLASS_OBJECT) { @@ -819,22 +824,24 @@ static bool copy_propagation_replace_with_single_instr(struct hlsl_ctx *ctx, } static bool copy_propagation_replace_with_constant_vector(struct hlsl_ctx *ctx, - const struct copy_propagation_state *state, struct hlsl_ir_load *load) + const struct copy_propagation_state *state, const struct hlsl_deref *deref, + unsigned int swizzle, struct hlsl_ir_node *instr) { - const struct hlsl_ir_var *var = load->src.var; + const unsigned int instr_component_count = hlsl_type_component_count(instr->data_type); + const struct hlsl_ir_var *var = deref->var; union hlsl_constant_value values[4] = {0}; - struct hlsl_ir_node *instr = &load->node; struct hlsl_ir_constant *cons; unsigned int start, count, i; - if (!hlsl_component_index_range_from_deref(ctx, &load->src, &start, &count)) + if (!hlsl_component_index_range_from_deref(ctx, deref, &start, &count)) return false; - for (i = 0; i < count; ++i) + for (i = 0; i < instr_component_count; ++i) { - struct copy_propagation_value *value = copy_propagation_get_value(state, var, start + i); + struct copy_propagation_value *value; - if (!value || value->node->type != HLSL_IR_CONSTANT) + if (!(value = copy_propagation_get_value(state, var, start + hlsl_swizzle_get_component(swizzle, i))) + || value->node->type != HLSL_IR_CONSTANT) return false; values[i] = hlsl_ir_constant(value->node)->value[value->component]; @@ -848,7 +855,8 @@ static bool copy_propagation_replace_with_constant_vector(struct hlsl_ctx *ctx, cons->value[3] = values[3]; list_add_before(&instr->entry, &cons->node.entry); - TRACE("Load from %s[%u-%u] turned into a constant %p.\n", var->name, start, start + count, cons); + TRACE("Load from %s[%u-%u]%s turned into a constant %p.\n", + var->name, start, start + count, debug_hlsl_swizzle(swizzle, instr_component_count), cons); hlsl_replace_node(instr, &cons->node); return true; @@ -874,10 +882,28 @@ static bool copy_propagation_transform_load(struct hlsl_ctx *ctx, return false; } - if (copy_propagation_replace_with_constant_vector(ctx, state, load)) + if (copy_propagation_replace_with_constant_vector(ctx, state, &load->src, HLSL_SWIZZLE(X, Y, Z, W), &load->node)) return true; - if (copy_propagation_replace_with_single_instr(ctx, state, load)) + if (copy_propagation_replace_with_single_instr(ctx, state, &load->src, HLSL_SWIZZLE(X, Y, Z, W), &load->node)) + return true; + + return false; +} + +static bool copy_propagation_transform_swizzle(struct hlsl_ctx *ctx, + struct hlsl_ir_swizzle *swizzle, struct copy_propagation_state *state) +{ + struct hlsl_ir_load *load; + + if (swizzle->val.node->type != HLSL_IR_LOAD) + return false; + load = hlsl_ir_load(swizzle->val.node); + + if (copy_propagation_replace_with_constant_vector(ctx, state, &load->src, swizzle->swizzle, &swizzle->node)) + return true; + + if (copy_propagation_replace_with_single_instr(ctx, state, &load->src, swizzle->swizzle, &swizzle->node)) return true; return false; @@ -1081,6 +1107,10 @@ static bool copy_propagation_transform_block(struct hlsl_ctx *ctx, struct hlsl_b copy_propagation_record_store(ctx, hlsl_ir_store(instr), state); break; + case HLSL_IR_SWIZZLE: + progress |= copy_propagation_transform_swizzle(ctx, hlsl_ir_swizzle(instr), state); + break; + case HLSL_IR_IF: progress |= copy_propagation_process_if(ctx, hlsl_ir_if(instr), state); break; diff --git a/tests/swizzle-constant-prop.shader_test b/tests/swizzle-constant-prop.shader_test index 2599983b..48c3ab79 100644 --- a/tests/swizzle-constant-prop.shader_test +++ b/tests/swizzle-constant-prop.shader_test @@ -13,7 +13,7 @@ size (4, 4) 13 13 13 13 14 14 14 14 14 15 15 15 16 16 16 16 -[pixel shader todo] +[pixel shader] Texture2D tex; uniform int i; @@ -25,8 +25,8 @@ float4 main() : sv_target [test] uniform 0 int 4 -todo draw quad -todo probe all rgba (110, 210, 410, 410) +draw quad +probe all rgba (110, 210, 410, 410) [pixel shader todo]

1 0

Francisco Casas : vkd3d-shader/hlsl: Use aoffimmis when writing gather resource loads.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: vkd3d Branch: master Commit: 18adf0d726a3134e6c30bea1518fe96ea0285374 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/18adf0d726a3134e6c30bea1518fe… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Nov 17 18:02:39 2022 -0300 vkd3d-shader/hlsl: Use aoffimmis when writing gather resource loads. If the offset of a gather resource load can be represented as an aoffimmi (vectori of ints from -8 to 7), use one. This is of particular importance for 4.0 profiles, where this is the only valid way of representing offsets for this operation. --- libs/vkd3d-shader/hlsl_sm4.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 06035a63..62266780 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -2154,11 +2154,19 @@ static void write_sm4_gather(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer sm4_src_from_node(&instr.srcs[instr.src_count++], coords, VKD3DSP_WRITEMASK_ALL); - /* FIXME: Use an aoffimmi modifier if possible. */ if (texel_offset) { - instr.opcode = VKD3D_SM5_OP_GATHER4_PO; - sm4_src_from_node(&instr.srcs[instr.src_count++], texel_offset, VKD3DSP_WRITEMASK_ALL); + if (!encode_texel_offset_as_aoffimmi(&instr, texel_offset)) + { + if (ctx->profile->major_version < 5) + { + hlsl_error(ctx, &texel_offset->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TEXEL_OFFSET, + "Offset must resolve to integer literal in the range -8 to 7 for profiles < 5."); + return; + } + instr.opcode = VKD3D_SM5_OP_GATHER4_PO; + sm4_src_from_node(&instr.srcs[instr.src_count++], texel_offset, VKD3DSP_WRITEMASK_ALL); + } } sm4_src_from_deref(ctx, &instr.srcs[instr.src_count++], resource, resource_type, instr.dsts[0].writemask);

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
47
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2023