April 2024 - Wine-commits - list.winehq.org

Alexandre Julliard : widl: Use padding instead of alignment in structure format strings.
by Alexandre Julliard 03 Apr '24

03 Apr '24

Module: wine Branch: master Commit: af058da8933024141bcbba52d9701b8b93e85a4a URL: https://gitlab.winehq.org/wine/wine/-/commit/af058da8933024141bcbba52d9701b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 3 12:34:39 2024 +0200 widl: Use padding instead of alignment in structure format strings. For compatibility with midl. --- tools/widl/typegen.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index f67c0182e4f..5fb77192799 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3161,25 +3161,12 @@ static void write_struct_members(FILE *file, const type_t *type, if (!is_conformant_array(ft) || type_array_is_decl_as_ptr(ft)) { - if ((align - 1) & offset) + unsigned short aligned = ROUND_SIZE(offset, align); + if (aligned > offset) { - unsigned char fc = 0; - switch (align) - { - case 2: - fc = FC_ALIGNM2; - break; - case 4: - fc = FC_ALIGNM4; - break; - case 8: - fc = FC_ALIGNM8; - break; - default: - error("write_struct_members: cannot align type %d\n", type_get_type(ft)); - } + unsigned char fc = FC_STRUCTPAD1 + (aligned - offset) - 1; print_file(file, 2, "0x%x,\t/* %s */\n", fc, string_of_type(fc)); - offset = ROUND_SIZE(offset, align); + offset = aligned; *typestring_offset += 1; } write_member_type(file, type, is_complex, field->attrs, field->declspec.type, corroff,

1 0

Alexandre Julliard : widl: Clear /robust flags when no descriptor is present.
by Alexandre Julliard 03 Apr '24

03 Apr '24

Module: wine Branch: master Commit: a1997507e8e6a1f9de6ae3e3ea5b4bab7d4cc3d3 URL: https://gitlab.winehq.org/wine/wine/-/commit/a1997507e8e6a1f9de6ae3e3ea5b4b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 3 16:59:52 2024 +0200 widl: Clear /robust flags when no descriptor is present. For compatibility with midl. --- tools/widl/typegen.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 5fb77192799..917f4b40a21 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1668,12 +1668,13 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *cont_type, const type_t *iface = NULL; const char *name; - robust_flags |= RobustEarly; if (!expr) { print_file(file, 2, "NdrFcLong(0xffffffff),\t/* -1 */\n"); + robust_flags = 0; goto done; } + robust_flags |= RobustEarly; if (expr->is_const) {

1 0

Zebediah Figura : vkd3d-shader/hlsl: Use hlsl_is_numeric_type() in type_has_object_components().
by Alexandre Julliard 02 Apr '24

02 Apr '24

Module: vkd3d Branch: master Commit: 106cbc02deff1eedaafa5326393f7dcedb2b043b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/106cbc02deff1eedaafa5326393f7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 26 16:12:27 2024 -0600 vkd3d-shader/hlsl: Use hlsl_is_numeric_type() in type_has_object_components(). --- libs/vkd3d-shader/hlsl.y | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index f6da4755..e69359f9 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2093,22 +2093,21 @@ static void initialize_var_components(struct hlsl_ctx *ctx, struct hlsl_block *i static bool type_has_object_components(const struct hlsl_type *type) { - if (type->class == HLSL_CLASS_OBJECT) - return true; if (type->class == HLSL_CLASS_ARRAY) return type_has_object_components(type->e.array.type); if (type->class == HLSL_CLASS_STRUCT) { - unsigned int i; - - for (i = 0; i < type->e.record.field_count; ++i) + for (unsigned int i = 0; i < type->e.record.field_count; ++i) { if (type_has_object_components(type->e.record.fields[i].type)) return true; } + + return false; } - return false; + + return !hlsl_is_numeric_type(type); } static bool type_has_numeric_components(struct hlsl_type *type)

1 0

Giovanni Mascellani : include: Include stddef.h in vkd3d_shader.h.
by Alexandre Julliard 02 Apr '24

02 Apr '24

Module: vkd3d Branch: master Commit: 5f2f126b705a0a1b7aa505b9c1a91fea8d6e7ffc URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5f2f126b705a0a1b7aa505b9c1a91… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sun Mar 31 21:53:53 2024 +0200 include: Include stddef.h in vkd3d_shader.h. Type size_t is used in the file without importing any header which defines it. This only works when the translation unit includes one of the appropriate headers anyway or when the appropriate header is included internally by other standard C headers; none of those strategies should be relied upon. --- include/vkd3d_shader.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 0ce2ef67..9ac5806c 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -21,6 +21,7 @@ #include <stdbool.h> #include <stdint.h> +#include <stddef.h> #include <vkd3d_types.h> #ifdef __cplusplus

1 0

Giovanni Mascellani : tests: Include vkd3d_d3d12.h in utils.h.
by Alexandre Julliard 02 Apr '24

02 Apr '24

Module: vkd3d Branch: master Commit: 2a101cf697c1b885447e9388c284a5cd0620caa1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2a101cf697c1b885447e9388c284a… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sun Mar 31 22:54:14 2024 +0200 tests: Include vkd3d_d3d12.h in utils.h. RECT and D3D12_BOX are used from there. --- tests/utils.h | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/utils.h b/tests/utils.h index 03c9b578..f9d3d9b1 100644 --- a/tests/utils.h +++ b/tests/utils.h @@ -24,6 +24,7 @@ #include <stdint.h> #include <stdlib.h> #include "vkd3d_test.h" +#include "vkd3d_d3d12.h" struct vec2 {

1 0

Giovanni Mascellani : vkd3d-compiler: Clean up the shader code in all failure paths (Valgrind).
by Alexandre Julliard 02 Apr '24

02 Apr '24

Module: vkd3d Branch: master Commit: 9047dad4bc99682592064619cfd7e4a139ba399d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9047dad4bc99682592064619cfd7e… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Apr 2 09:48:46 2024 +0200 vkd3d-compiler: Clean up the shader code in all failure paths (Valgrind). --- programs/vkd3d-compiler/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 245052e9..1e05c093 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -718,7 +718,7 @@ int main(int argc, char **argv) struct vkd3d_shader_spirv_target_info spirv_target_info = {0}; struct vkd3d_shader_hlsl_source_info hlsl_source_info = {0}; bool close_input = false, close_output = false; - struct vkd3d_shader_compile_info info; + struct vkd3d_shader_compile_info info = {0}; struct vkd3d_shader_code output_code; struct options options; FILE *input, *output; @@ -876,7 +876,6 @@ int main(int argc, char **argv) if (messages) fputs(messages, stderr); vkd3d_shader_free_messages(messages); - vkd3d_shader_free_shader_code(&info.source); if (ret < 0) { fprintf(stderr, "Failed to compile shader, ret %d.\n", ret); @@ -893,6 +892,7 @@ int main(int argc, char **argv) fail = 0; vkd3d_shader_free_shader_code(&output_code); done: + vkd3d_shader_free_shader_code(&info.source); free(options.compile_options); if (close_output) fclose(output);

1 0

Giovanni Mascellani : vkd3d-shader/ir: Move vsir_program_normalise() to the end of the file.
by Alexandre Julliard 02 Apr '24

02 Apr '24

Module: vkd3d Branch: master Commit: d10031911d3eaa5964edfc5950839639a371f6f6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d10031911d3eaa5964edfc5950839… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Apr 2 10:01:13 2024 +0200 vkd3d-shader/ir: Move vsir_program_normalise() to the end of the file. vsir_program_normalise() has function calls to basically everything in ir.c, so it's useful to have it in an easily reachable place to quickly jump to wherever you need using your favorite code editor's features. --- libs/vkd3d-shader/ir.c | 200 ++++++++++++++++++++++++------------------------- 1 file changed, 100 insertions(+), 100 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 4f022618..15fe6ca9 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -4393,106 +4393,6 @@ fail: return ret; } -enum vkd3d_result vsir_program_normalise(struct vsir_program *program, uint64_t config_flags, - const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_message_context *message_context) -{ - enum vkd3d_result result = VKD3D_OK; - - remove_dcl_temps(program); - - if ((result = vsir_program_lower_texkills(program)) < 0) - return result; - - if (program->shader_version.major >= 6) - { - struct vsir_cfg cfg; - - if ((result = lower_switch_to_if_ladder(program)) < 0) - return result; - - if ((result = vsir_program_materialise_ssas_to_temps(program)) < 0) - return result; - - if ((result = vsir_cfg_init(&cfg, program, message_context)) < 0) - return result; - - vsir_cfg_compute_dominators(&cfg); - - if ((result = vsir_cfg_compute_loops(&cfg)) < 0) - { - vsir_cfg_cleanup(&cfg); - return result; - } - - if ((result = vsir_cfg_sort_nodes(&cfg)) < 0) - { - vsir_cfg_cleanup(&cfg); - return result; - } - - if ((result = vsir_cfg_generate_synthetic_loop_intervals(&cfg)) < 0) - { - vsir_cfg_cleanup(&cfg); - return result; - } - - if ((result = vsir_cfg_build_structured_program(&cfg)) < 0) - { - vsir_cfg_cleanup(&cfg); - return result; - } - - if ((result = vsir_cfg_emit_structured_program(&cfg)) < 0) - { - vsir_cfg_cleanup(&cfg); - return result; - } - - vsir_cfg_cleanup(&cfg); - } - else - { - if (program->shader_version.type != VKD3D_SHADER_TYPE_PIXEL) - { - if ((result = vsir_program_remap_output_signature(program, compile_info, message_context)) < 0) - return result; - } - - if (program->shader_version.type == VKD3D_SHADER_TYPE_HULL) - { - if ((result = instruction_array_flatten_hull_shader_phases(&program->instructions)) < 0) - return result; - - if ((result = instruction_array_normalise_hull_shader_control_point_io(&program->instructions, - &program->input_signature)) < 0) - return result; - } - - if ((result = vsir_program_normalise_io_registers(program)) < 0) - return result; - - if ((result = instruction_array_normalise_flat_constants(program)) < 0) - return result; - - remove_dead_code(program); - - if ((result = vsir_program_normalise_combined_samplers(program, message_context)) < 0) - return result; - } - - if ((result = vsir_program_flatten_control_flow_constructs(program, message_context)) < 0) - return result; - - if (TRACE_ON()) - vkd3d_shader_trace(program); - - if ((result = vsir_program_validate(program, config_flags, - compile_info->source_name, message_context)) < 0) - return result; - - return result; -} - struct validation_context { struct vkd3d_shader_message_context *message_context; @@ -5357,3 +5257,103 @@ fail: return VKD3D_ERROR_OUT_OF_MEMORY; } + +enum vkd3d_result vsir_program_normalise(struct vsir_program *program, uint64_t config_flags, + const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_message_context *message_context) +{ + enum vkd3d_result result = VKD3D_OK; + + remove_dcl_temps(program); + + if ((result = vsir_program_lower_texkills(program)) < 0) + return result; + + if (program->shader_version.major >= 6) + { + struct vsir_cfg cfg; + + if ((result = lower_switch_to_if_ladder(program)) < 0) + return result; + + if ((result = vsir_program_materialise_ssas_to_temps(program)) < 0) + return result; + + if ((result = vsir_cfg_init(&cfg, program, message_context)) < 0) + return result; + + vsir_cfg_compute_dominators(&cfg); + + if ((result = vsir_cfg_compute_loops(&cfg)) < 0) + { + vsir_cfg_cleanup(&cfg); + return result; + } + + if ((result = vsir_cfg_sort_nodes(&cfg)) < 0) + { + vsir_cfg_cleanup(&cfg); + return result; + } + + if ((result = vsir_cfg_generate_synthetic_loop_intervals(&cfg)) < 0) + { + vsir_cfg_cleanup(&cfg); + return result; + } + + if ((result = vsir_cfg_build_structured_program(&cfg)) < 0) + { + vsir_cfg_cleanup(&cfg); + return result; + } + + if ((result = vsir_cfg_emit_structured_program(&cfg)) < 0) + { + vsir_cfg_cleanup(&cfg); + return result; + } + + vsir_cfg_cleanup(&cfg); + } + else + { + if (program->shader_version.type != VKD3D_SHADER_TYPE_PIXEL) + { + if ((result = vsir_program_remap_output_signature(program, compile_info, message_context)) < 0) + return result; + } + + if (program->shader_version.type == VKD3D_SHADER_TYPE_HULL) + { + if ((result = instruction_array_flatten_hull_shader_phases(&program->instructions)) < 0) + return result; + + if ((result = instruction_array_normalise_hull_shader_control_point_io(&program->instructions, + &program->input_signature)) < 0) + return result; + } + + if ((result = vsir_program_normalise_io_registers(program)) < 0) + return result; + + if ((result = instruction_array_normalise_flat_constants(program)) < 0) + return result; + + remove_dead_code(program); + + if ((result = vsir_program_normalise_combined_samplers(program, message_context)) < 0) + return result; + } + + if ((result = vsir_program_flatten_control_flow_constructs(program, message_context)) < 0) + return result; + + if (TRACE_ON()) + vkd3d_shader_trace(program); + + if ((result = vsir_program_validate(program, config_flags, + compile_info->source_name, message_context)) < 0) + return result; + + return result; +}

1 0

Henri Verbeet : tests: Initialise resource_desc1.Layout in test_get_copyable_footprints() (Valgrind).
by Alexandre Julliard 02 Apr '24

02 Apr '24

Module: vkd3d Branch: master Commit: 46bd3b15457d73e38ce449cb0527b0fd5c96cdc6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/46bd3b15457d73e38ce449cb0527b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 2 16:29:52 2024 +0200 tests: Initialise resource_desc1.Layout in test_get_copyable_footprints() (Valgrind). --- tests/d3d12.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 15aed9f3..8e34978f 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -20302,6 +20302,7 @@ static void test_get_copyable_footprints(void) resource_desc1.Format = resource_desc.Format; resource_desc1.SampleDesc.Count = resource_desc.SampleDesc.Count; resource_desc1.SampleDesc.Quality = resource_desc.SampleDesc.Quality; + resource_desc1.Layout = resource_desc.Layout; resource_desc1.Flags = resource_desc.Flags; memset(&resource_desc1.SamplerFeedbackMipRegion, 0, sizeof(resource_desc1.SamplerFeedbackMipRegion)); memset(layouts, 0, sizeof(layouts));

1 0

Henri Verbeet : tests/shader_runner: Cleanup on insufficient GLSL support in gl_runner_init() (Valgrind).
by Alexandre Julliard 02 Apr '24

02 Apr '24

Module: vkd3d Branch: master Commit: 64418dd290ae2ba0c0dd02a09aaad40543a2cb64 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/64418dd290ae2ba0c0dd02a09aaad… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 2 16:31:56 2024 +0200 tests/shader_runner: Cleanup on insufficient GLSL support in gl_runner_init() (Valgrind). --- tests/shader_runner_gl.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/shader_runner_gl.c b/tests/shader_runner_gl.c index 3c2a4196..e56eccab 100644 --- a/tests/shader_runner_gl.c +++ b/tests/shader_runner_gl.c @@ -241,6 +241,9 @@ static bool gl_runner_init(struct gl_runner *runner, enum shading_language langu if (major < 4 || (major == 4 && minor < 40)) { trace("Device %u does not support GLSL 4.40.\n", i); + eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); + eglDestroyContext(display, context); + eglTerminate(display); continue; } }

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Allow annotations on constant buffers.
by Alexandre Julliard 02 Apr '24

02 Apr '24

Module: vkd3d Branch: master Commit: c509c85f6314ac4b605564cb896ff3c7755df68c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c509c85f6314ac4b605564cb896ff… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 28 02:22:15 2024 +0100 vkd3d-shader/hlsl: Allow annotations on constant buffers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/fx.c | 3 ++- libs/vkd3d-shader/hlsl.c | 8 +++++--- libs/vkd3d-shader/hlsl.h | 5 ++++- libs/vkd3d-shader/hlsl.y | 4 ++-- tests/hlsl/cbuffer.shader_test | 18 ++++++++++++++++++ 5 files changed, 31 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index 9424a568..5fcd3eac 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -1038,7 +1038,8 @@ static void write_fx_4_buffer(struct hlsl_buffer *b, struct fx_write_context *fx put_u32(buffer, bind_point); /* Bind point */ put_u32(buffer, 0); /* Annotations count */ - /* FIXME: write annotations */ + if (b->annotations) + hlsl_fixme(ctx, &b->loc, "Writing annotations for buffers is not implemented."); count = 0; size = 0; diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index cba954c9..17458963 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -2031,7 +2031,8 @@ struct hlsl_ir_function_decl *hlsl_new_func_decl(struct hlsl_ctx *ctx, } struct hlsl_buffer *hlsl_new_buffer(struct hlsl_ctx *ctx, enum hlsl_buffer_type type, const char *name, - uint32_t modifiers, const struct hlsl_reg_reservation *reservation, const struct vkd3d_shader_location *loc) + uint32_t modifiers, const struct hlsl_reg_reservation *reservation, struct hlsl_scope *annotations, + const struct vkd3d_shader_location *loc) { struct hlsl_buffer *buffer; @@ -2042,6 +2043,7 @@ struct hlsl_buffer *hlsl_new_buffer(struct hlsl_ctx *ctx, enum hlsl_buffer_type buffer->modifiers = modifiers; if (reservation) buffer->reservation = *reservation; + buffer->annotations = annotations; buffer->loc = *loc; list_add_tail(&ctx->buffers, &buffer->entry); return buffer; @@ -3586,10 +3588,10 @@ static bool hlsl_ctx_init(struct hlsl_ctx *ctx, const struct vkd3d_shader_compil list_init(&ctx->buffers); if (!(ctx->globals_buffer = hlsl_new_buffer(ctx, HLSL_BUFFER_CONSTANT, - hlsl_strdup(ctx, "$Globals"), 0, NULL, &ctx->location))) + hlsl_strdup(ctx, "$Globals"), 0, NULL, NULL, &ctx->location))) return false; if (!(ctx->params_buffer = hlsl_new_buffer(ctx, HLSL_BUFFER_CONSTANT, - hlsl_strdup(ctx, "$Params"), 0, NULL, &ctx->location))) + hlsl_strdup(ctx, "$Params"), 0, NULL, NULL, &ctx->location))) return false; ctx->cur_buffer = ctx->globals_buffer; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 64111f3f..4f9f04c7 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -806,6 +806,8 @@ struct hlsl_buffer * If provided, it should be of type 'b' if type is HLSL_BUFFER_CONSTANT and 't' if type is * HLSL_BUFFER_TEXTURE. */ struct hlsl_reg_reservation reservation; + /* Scope that contains annotations for this buffer. */ + struct hlsl_scope *annotations; /* Item entry for hlsl_ctx.buffers */ struct list entry; @@ -1228,7 +1230,8 @@ struct hlsl_ir_node *hlsl_new_binary_expr(struct hlsl_ctx *ctx, enum hlsl_ir_exp struct hlsl_ir_node *arg2); struct hlsl_ir_node *hlsl_new_bool_constant(struct hlsl_ctx *ctx, bool b, const struct vkd3d_shader_location *loc); struct hlsl_buffer *hlsl_new_buffer(struct hlsl_ctx *ctx, enum hlsl_buffer_type type, const char *name, - uint32_t modifiers, const struct hlsl_reg_reservation *reservation, const struct vkd3d_shader_location *loc); + uint32_t modifiers, const struct hlsl_reg_reservation *reservation, struct hlsl_scope *annotations, + const struct vkd3d_shader_location *loc); struct hlsl_ir_node *hlsl_new_call(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *decl, const struct vkd3d_shader_location *loc); struct hlsl_ir_node *hlsl_new_cast(struct hlsl_ctx *ctx, struct hlsl_ir_node *node, struct hlsl_type *type, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index e69359f9..9135fb7a 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -5665,12 +5665,12 @@ effect_group: } buffer_declaration: - var_modifiers buffer_type any_identifier colon_attribute + var_modifiers buffer_type any_identifier colon_attribute annotations_opt { if ($4.semantic.name) hlsl_error(ctx, &@4, VKD3D_SHADER_ERROR_HLSL_INVALID_SEMANTIC, "Semantics are not allowed on buffers."); - if (!(ctx->cur_buffer = hlsl_new_buffer(ctx, $2, $3, $1, &$4.reg_reservation, &@3))) + if (!(ctx->cur_buffer = hlsl_new_buffer(ctx, $2, $3, $1, &$4.reg_reservation, $5, &@3))) YYABORT; } diff --git a/tests/hlsl/cbuffer.shader_test b/tests/hlsl/cbuffer.shader_test index 690491b7..2140e1b8 100644 --- a/tests/hlsl/cbuffer.shader_test +++ b/tests/hlsl/cbuffer.shader_test @@ -16,6 +16,24 @@ uniform 0 float4 1.0 2.0 3.0 4.0 todo(glsl) draw quad probe all rgba (1.0, 2.0, 3.0, 4.0) +[pixel shader fail(sm>=6)] +// Annotations +cbuffer cb : register(b1) < int i = 1; > +{ + float4 m1; +}; + +cbuffer cb < int i = 2; > +{ + float4 m2; +}; + +float4 main() : sv_target +{ + return m1 + m2; +} + + [pixel shader] // Test empty constant buffer. cbuffer Constants : register(b1)

1 0