March 2021 - Wine-commits - list.winehq.org

Zebediah Figura : d3d11/tests: Test ID3D11DeviceContext1::SwapDeviceContextState() on a deferred context.
by Alexandre Julliard 05 Mar '21

05 Mar '21

Module: wine Branch: master Commit: cc82a51a076d7c936cba70d426c95de50a28e750 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc82a51a076d7c936cba70d4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 4 21:19:09 2021 -0600 d3d11/tests: Test ID3D11DeviceContext1::SwapDeviceContextState() on a deferred context. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index c40593d31d8..6cdac34c0cd 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -31969,6 +31969,64 @@ static void test_deferred_context_state(void) release_test_context(&test_context); } +static void test_deferred_context_swap_state(void) +{ + ID3D11DeviceContext1 *immediate, *deferred; + ID3DDeviceContextState *state, *prev_state; + ID3D11Buffer *green_buffer, *ret_buffer; + struct d3d11_test_context test_context; + D3D_FEATURE_LEVEL feature_level; + ID3D11Device1 *device; + HRESULT hr; + + static const float green[] = {0.0f, 1.0f, 0.0f, 1.0f}; + + if (!init_test_context(&test_context, NULL)) + return; + + if (FAILED(ID3D11Device_QueryInterface(test_context.device, &IID_ID3D11Device1, (void **)&device))) + { + skip("ID3D11Device1 is not available.\n"); + release_test_context(&test_context); + return; + } + + ID3D11Device1_GetImmediateContext1(device, &immediate); + + green_buffer = create_buffer(test_context.device, D3D11_BIND_CONSTANT_BUFFER, sizeof(green), &green); + ID3D11DeviceContext1_PSSetConstantBuffers(immediate, 0, 1, &green_buffer); + + hr = ID3D11Device1_CreateDeferredContext1(device, 0, &deferred); + todo_wine ok(hr == S_OK, "Failed to create deferred context, hr %#x.\n", hr); + if (hr != S_OK) + goto out; + + feature_level = ID3D11Device1_GetFeatureLevel(device); + hr = ID3D11Device1_CreateDeviceContextState(device, 0, &feature_level, 1, D3D11_SDK_VERSION, + &IID_ID3D11Device1, NULL, &state); + ok(hr == S_OK, "Failed to create device context state, hr %#x.\n", hr); + + prev_state = (void *)0xdeadbeef; + ID3D11DeviceContext1_SwapDeviceContextState(deferred, NULL, &prev_state); + ok(!prev_state, "Got state %p.\n", prev_state); + + prev_state = (void *)0xdeadbeef; + ID3D11DeviceContext1_SwapDeviceContextState(deferred, state, &prev_state); + ok(!prev_state, "Got state %p.\n", prev_state); + + ID3D11DeviceContext1_PSGetConstantBuffers(deferred, 0, 1, &ret_buffer); + ok(!ret_buffer, "Got unexpected buffer %p.\n", ret_buffer); + + ID3DDeviceContextState_Release(state); + ID3D11DeviceContext1_Release(deferred); + +out: + ID3D11Buffer_Release(green_buffer); + ID3D11DeviceContext1_Release(immediate); + ID3D11Device1_Release(device); + release_test_context(&test_context); +} + static void test_deferred_context_rendering(void) { ID3D11DeviceContext *immediate, *deferred; @@ -32238,6 +32296,7 @@ START_TEST(d3d11) queue_test(test_independent_blend); queue_test(test_dual_source_blend); queue_test(test_deferred_context_state); + queue_test(test_deferred_context_swap_state); queue_test(test_deferred_context_rendering); run_queued_tests();

1 0

Zebediah Figura : wined3d: Separate the "ops" member of struct wined3d_cs to a new wined3d_device_context structure.
by Alexandre Julliard 05 Mar '21

05 Mar '21

Module: wine Branch: master Commit: fc3919c4abd82a3ef8c877bfacddf6998b48ba50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc3919c4abd82a3ef8c877bf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 4 21:29:44 2021 -0600 wined3d: Separate the "ops" member of struct wined3d_cs to a new wined3d_device_context structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 2 +- dlls/wined3d/adapter_vk.c | 2 +- dlls/wined3d/cs.c | 54 ++++++++++++++++++++++++++++-------------- dlls/wined3d/wined3d_private.h | 23 +++++++++++------- 4 files changed, 53 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fc3919c4abd82a3ef8c8…

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_submit().
by Alexandre Julliard 05 Mar '21

05 Mar '21

Module: wine Branch: master Commit: 864a9f3e322f652564852da1683dd85a6adcaa6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=864a9f3e322f652564852da1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 4 21:29:45 2021 -0600 wined3d: Pass a wined3d_device_context to wined3d_cs_submit(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 107 +++++++++++++++++++++++++++--------------------------- 1 file changed, 54 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=864a9f3e322f65256485…

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_require_space().
by Alexandre Julliard 05 Mar '21

05 Mar '21

Module: wine Branch: master Commit: d3aebfed9203285e876d6d121097d1fd73a68106 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3aebfed9203285e876d6d12… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 4 21:29:46 2021 -0600 wined3d: Pass a wined3d_device_context to wined3d_cs_require_space(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 106 +++++++++++++++++++++++++++--------------------------- 1 file changed, 53 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d3aebfed9203285e876d…

1 0

Zebediah Figura : wined3d: Move the "device" member of struct wined3d_cs to struct wined3d_device_context.
by Alexandre Julliard 05 Mar '21

05 Mar '21

Module: wine Branch: master Commit: 55a0507ee88db101ebcae512d5c1309ebe9a3103 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55a0507ee88db101ebcae512… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 4 21:29:47 2021 -0600 wined3d: Move the "device" member of struct wined3d_cs to struct wined3d_device_context. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 149 ++++++++++++++++++++--------------------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 75 insertions(+), 76 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=55a0507ee88db101ebca…

1 0

Zebediah Figura : vkd3d-shader: Move the remainder of hlsl_parser_compile() to hlsl_compile_shader().
by Alexandre Julliard 05 Mar '21

05 Mar '21

Module: vkd3d Branch: master Commit: 8ce33da2abef3896c7d3da92191afb13db5c7571 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8ce33da2abef3896c7d3da9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 4 17:33:24 2021 -0600 vkd3d-shader: Move the remainder of hlsl_parser_compile() to hlsl_compile_shader(). 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: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- libs/vkd3d-shader/hlsl.h | 4 ++-- libs/vkd3d-shader/hlsl.l | 4 ++-- libs/vkd3d-shader/hlsl.y | 47 +---------------------------------------------- 4 files changed, 47 insertions(+), 52 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 0486c95..02fa484 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -188,6 +188,22 @@ bool hlsl_get_function(struct hlsl_ctx *ctx, const char *name) return rb_get(&ctx->functions, name) != NULL; } +struct hlsl_ir_function_decl *hlsl_get_func_decl(struct hlsl_ctx *ctx, const char *name) +{ + struct hlsl_ir_function_decl *decl; + struct hlsl_ir_function *func; + struct rb_entry *entry; + + if ((entry = rb_get(&ctx->functions, name))) + { + func = RB_ENTRY_VALUE(entry, struct hlsl_ir_function, entry); + RB_FOR_EACH_ENTRY(decl, &func->overloads, struct hlsl_ir_function_decl, entry) + return decl; + } + + return NULL; +} + unsigned int hlsl_type_component_count(struct hlsl_type *type) { struct hlsl_struct_field *field; @@ -1606,7 +1622,9 @@ int hlsl_compile_shader(const char *text, const struct vkd3d_shader_compile_info struct vkd3d_shader_code *dxbc, struct vkd3d_shader_message_context *message_context) { const struct vkd3d_shader_hlsl_source_info *hlsl_source_info; + struct hlsl_ir_function_decl *entry_func; const struct hlsl_profile_info *profile; + const char *entry_point; struct hlsl_ctx ctx; int ret; @@ -1615,6 +1633,7 @@ int hlsl_compile_shader(const char *text, const struct vkd3d_shader_compile_info ERR("No HLSL source info given.\n"); return VKD3D_ERROR_INVALID_ARGUMENT; } + entry_point = hlsl_source_info->entry_point ? hlsl_source_info->entry_point : "main"; if (!(profile = get_target_info(hlsl_source_info->profile))) { @@ -1627,9 +1646,30 @@ int hlsl_compile_shader(const char *text, const struct vkd3d_shader_compile_info if (!hlsl_ctx_init(&ctx, message_context)) return VKD3D_ERROR_OUT_OF_MEMORY; - ret = hlsl_lexer_compile(&ctx, text, hlsl_source_info->entry_point ? hlsl_source_info->entry_point : "main"); + hlsl_lexer_compile(&ctx, text); - hlsl_ctx_cleanup(&ctx); + if (ctx.failed) + { + hlsl_ctx_cleanup(&ctx); + return VKD3D_ERROR_INVALID_SHADER; + } + + if (!(entry_func = hlsl_get_func_decl(&ctx, entry_point))) + { + const struct vkd3d_shader_location loc = {.source_name = compile_info->source_name}; + hlsl_error(&ctx, loc, VKD3D_SHADER_ERROR_HLSL_NOT_DEFINED, + "Entry point \"%s\" is not defined.", entry_point); + return VKD3D_ERROR_INVALID_SHADER; + } + + if (!hlsl_type_is_void(entry_func->return_type) + && entry_func->return_type->type != HLSL_CLASS_STRUCT && !entry_func->semantic) + hlsl_error(&ctx, entry_func->loc, VKD3D_SHADER_ERROR_HLSL_MISSING_SEMANTIC, + "Entry point \"%s\" is missing a return value semantic.", entry_point); + + ret = hlsl_emit_dxbc(&ctx, entry_func); + + hlsl_ctx_cleanup(&ctx); return ret; } diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 73ba2be..4af021e 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -518,6 +518,7 @@ void hlsl_free_type(struct hlsl_type *type) DECLSPEC_HIDDEN; void hlsl_free_var(struct hlsl_ir_var *decl) DECLSPEC_HIDDEN; bool hlsl_get_function(struct hlsl_ctx *ctx, const char *name) DECLSPEC_HIDDEN; +struct hlsl_ir_function_decl *hlsl_get_func_decl(struct hlsl_ctx *ctx, const char *name) DECLSPEC_HIDDEN; struct hlsl_type *hlsl_get_type(struct hlsl_scope *scope, const char *name, bool recursive) DECLSPEC_HIDDEN; struct hlsl_ir_var *hlsl_get_var(struct hlsl_scope *scope, const char *name) DECLSPEC_HIDDEN; @@ -571,7 +572,6 @@ unsigned int hlsl_type_component_count(struct hlsl_type *type) DECLSPEC_HIDDEN; bool hlsl_type_is_row_major(const struct hlsl_type *type) DECLSPEC_HIDDEN; bool hlsl_type_is_void(const struct hlsl_type *type) DECLSPEC_HIDDEN; -int hlsl_lexer_compile(struct hlsl_ctx *ctx, const char *text, const char *entrypoint) DECLSPEC_HIDDEN; -int hlsl_parser_compile(struct hlsl_ctx *ctx, const char *entrypoint) DECLSPEC_HIDDEN; +int hlsl_lexer_compile(struct hlsl_ctx *ctx, const char *text) DECLSPEC_HIDDEN; #endif diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index 4cc0a3e..da54d57 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -282,7 +282,7 @@ static void update_location(struct hlsl_ctx *ctx, YYLTYPE *lloc) ctx->location.column += yyget_leng(ctx->scanner); } -int hlsl_lexer_compile(struct hlsl_ctx *ctx, const char *text, const char *entrypoint) +int hlsl_lexer_compile(struct hlsl_ctx *ctx, const char *text) { YY_BUFFER_STATE buffer; int ret; @@ -291,7 +291,7 @@ int hlsl_lexer_compile(struct hlsl_ctx *ctx, const char *text, const char *entry buffer = yy_scan_string(text, ctx->scanner); yy_switch_to_buffer(buffer, ctx->scanner); - ret = hlsl_parser_compile(ctx, entrypoint); + ret = hlsl_yyparse(ctx->scanner, ctx); yy_delete_buffer(buffer, ctx->scanner); yylex_destroy(ctx->scanner); diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index ae15118..6674774 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -286,22 +286,6 @@ static struct hlsl_ir_node *add_implicit_conversion(struct hlsl_ctx *ctx, struct return &cast->node; } -static struct hlsl_ir_function_decl *get_func_entry(struct hlsl_ctx *ctx, const char *name) -{ - struct hlsl_ir_function_decl *decl; - struct hlsl_ir_function *func; - struct rb_entry *entry; - - if ((entry = rb_get(&ctx->functions, name))) - { - func = RB_ENTRY_VALUE(entry, struct hlsl_ir_function, entry); - RB_FOR_EACH_ENTRY(decl, &func->overloads, struct hlsl_ir_function_decl, entry) - return decl; - } - - return NULL; -} - static bool declare_variable(struct hlsl_ctx *ctx, struct hlsl_ir_var *decl, bool local) { struct hlsl_ir_function_decl *func; @@ -334,7 +318,7 @@ static bool declare_variable(struct hlsl_ctx *ctx, struct hlsl_ir_var *decl, boo } else { - if ((func = get_func_entry(ctx, decl->name))) + if ((func = hlsl_get_func_decl(ctx, decl->name))) { hlsl_error(ctx, decl->loc, VKD3D_SHADER_ERROR_HLSL_REDEFINED, "Variable '%s' is already defined as a function.", decl->name); @@ -3012,32 +2996,3 @@ expr: list_move_tail($$, $3); vkd3d_free($3); } - -%% - -int hlsl_parser_compile(struct hlsl_ctx *ctx, const char *entrypoint) -{ - struct hlsl_ir_function_decl *entry_func; - - yyparse(ctx->scanner, ctx); - - if (ctx->failed) - return VKD3D_ERROR_INVALID_SHADER; - - if (!(entry_func = get_func_entry(ctx, entrypoint))) - { - const struct vkd3d_shader_location loc = {.source_name = ctx->location.source_name}; - - hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_NOT_DEFINED, "Entry point \"%s\" is not defined.", entrypoint); - return VKD3D_ERROR_INVALID_SHADER; - } - - if (!hlsl_type_is_void(entry_func->return_type) - && entry_func->return_type->type != HLSL_CLASS_STRUCT && !entry_func->semantic) - { - hlsl_error(ctx, entry_func->loc, VKD3D_SHADER_ERROR_HLSL_MISSING_SEMANTIC, - "Entry point \"%s\" is missing a return value semantic.", entry_func->func->name); - } - - return hlsl_emit_dxbc(ctx, entry_func); -}

1 0

Zebediah Figura : tests: Add some tests for nested arrays.
by Alexandre Julliard 05 Mar '21

05 Mar '21

Module: vkd3d Branch: master Commit: 2b38799e66687fe3bbb3fa5ed72e710d20c28123 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2b38799e66687fe3bbb3fa5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 4 17:33:26 2021 -0600 tests: Add some tests for nested arrays. 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: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 ++ tests/hlsl-nested-arrays.shader_test | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/Makefile.am b/Makefile.am index 3b09dc7..a412194 100644 --- a/Makefile.am +++ b/Makefile.am @@ -57,6 +57,7 @@ vkd3d_shader_tests = \ tests/hlsl-invalid.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ + tests/hlsl-nested-arrays.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ tests/hlsl-static-initializer.shader_test \ @@ -249,6 +250,7 @@ XFAIL_TESTS = \ tests/hlsl-comma.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ + tests/hlsl-nested-arrays.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ tests/hlsl-static-initializer.shader_test \ diff --git a/tests/hlsl-nested-arrays.shader_test b/tests/hlsl-nested-arrays.shader_test new file mode 100644 index 0000000..66ae93e --- /dev/null +++ b/tests/hlsl-nested-arrays.shader_test @@ -0,0 +1,25 @@ +[pixel shader fail] +uniform float4 color[2][3]; + +float4 main() : sv_target +{ + return color[2][1]; +} + +[pixel shader] +uniform float color[2][3]; + +float4 main() : sv_target +{ + return float4(color[1][0], color[0][0], color[1][2], color[0][2]); +} + +[test] +uniform 0 float4 0.1 0.0 0.0 0.0 +uniform 4 float4 0.2 0.0 0.0 0.0 +uniform 8 float4 0.3 0.0 0.0 0.0 +uniform 12 float4 0.4 0.0 0.0 0.0 +uniform 16 float4 0.5 0.0 0.0 0.0 +uniform 20 float4 0.6 0.0 0.0 0.0 +draw quad +probe all rgba (0.4, 0.1, 0.6, 0.3)

1 0

Zebediah Figura : vkd3d-shader: Parse nested arrays.
by Alexandre Julliard 05 Mar '21

05 Mar '21

Module: vkd3d Branch: master Commit: 405f2db4d97b1a8c46e70e1797a3a5e8f779c96f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=405f2db4d97b1a8c46e70e1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 4 17:33:27 2021 -0600 vkd3d-shader: Parse nested arrays. 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: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 109 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 76 insertions(+), 33 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 6674774..ce4bd62 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -50,13 +50,19 @@ struct parse_initializer struct list *instrs; }; +struct parse_array_sizes +{ + uint32_t *sizes; /* innermost first */ + unsigned int count; +}; + struct parse_variable_def { struct list entry; struct vkd3d_shader_location loc; char *name; - uint32_t array_size; + struct parse_array_sizes arrays; const char *semantic; struct hlsl_reg_reservation *reg_reservation; struct parse_initializer initializer; @@ -732,15 +738,17 @@ static struct list *gen_struct_fields(struct hlsl_ctx *ctx, struct hlsl_type *ty return NULL; LIST_FOR_EACH_ENTRY_SAFE(v, v_next, fields, struct parse_variable_def, entry) { + unsigned int i; + if (!(field = vkd3d_calloc(1, sizeof(*field)))) { vkd3d_free(v); return list; } - if (v->array_size) - field->type = hlsl_new_array_type(ctx, type, v->array_size); - else - field->type = type; + + field->type = type; + for (i = 0; i < v->arrays.count; ++i) + field->type = hlsl_new_array_type(ctx, field->type, v->arrays.sizes[i]); field->loc = v->loc; field->name = v->name; field->modifiers = modifiers; @@ -761,16 +769,27 @@ static bool add_typedef(struct hlsl_ctx *ctx, DWORD modifiers, struct hlsl_type { struct parse_variable_def *v, *v_next; struct hlsl_type *type; + unsigned int i; bool ret; LIST_FOR_EACH_ENTRY_SAFE(v, v_next, list, struct parse_variable_def, entry) { - if (v->array_size) - type = hlsl_new_array_type(ctx, orig_type, v->array_size); + if (!v->arrays.count) + { + if (!(type = hlsl_type_clone(ctx, orig_type, 0))) + return false; + } else - type = hlsl_type_clone(ctx, orig_type, 0); - if (!type) - return false; + { + type = orig_type; + } + + for (i = 0; i < v->arrays.count; ++i) + { + if (!(type = hlsl_new_array_type(ctx, type, v->arrays.sizes[i]))) + return false; + } + vkd3d_free((void *)type->name); type->name = v->name; type->modifiers |= modifiers; @@ -1369,6 +1388,7 @@ static void struct_var_initializer(struct hlsl_ctx *ctx, struct list *list, stru static void free_parse_variable_def(struct parse_variable_def *v) { free_parse_initializer(&v->initializer); + vkd3d_free(v->arrays.sizes); vkd3d_free(v->name); vkd3d_free((void *)v->semantic); vkd3d_free(v->reg_reservation); @@ -1400,10 +1420,11 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t LIST_FOR_EACH_ENTRY_SAFE(v, v_next, var_list, struct parse_variable_def, entry) { - if (v->array_size) - type = hlsl_new_array_type(ctx, basic_type, v->array_size); - else - type = basic_type; + unsigned int i; + + type = basic_type; + for (i = 0; i < v->arrays.count; ++i) + type = hlsl_new_array_type(ctx, type, v->arrays.sizes[i]); if (!(var = hlsl_new_var(v->name, type, v->loc, v->semantic, modifiers, v->reg_reservation))) { @@ -1475,7 +1496,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t vkd3d_free(v); continue; } - if (v->array_size > 0) + if (v->arrays.count) { FIXME("Initializing arrays is not supported yet.\n"); free_parse_initializer(&v->initializer); @@ -1531,6 +1552,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t struct parse_function function; struct parse_parameter parameter; struct parse_initializer initializer; + struct parse_array_sizes arrays; struct parse_variable_def *variable_def; struct parse_if_body if_body; enum parse_unary_op unary_op; @@ -1681,6 +1703,8 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t %token <name> STRING %token <name> TYPE_IDENTIFIER +%type <arrays> arrays + %type <assign_op> assign_op %type <boolval> boolean @@ -1695,8 +1719,6 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t %type <if_body> if_body -%type <intval> array - %type <modifiers> input_mod %type <modifiers> input_mods %type <modifiers> var_modifiers @@ -2217,12 +2239,12 @@ type_specs: } type_spec: - any_identifier array + any_identifier arrays { $$ = vkd3d_calloc(1, sizeof(*$$)); $$->loc = @1; $$->name = $1; - $$->array_size = $2; + $$->arrays = $2; } declaration: @@ -2257,41 +2279,46 @@ variables_def: } variable_def: - any_identifier array colon_attribute + any_identifier arrays colon_attribute { $$ = vkd3d_calloc(1, sizeof(*$$)); $$->loc = @1; $$->name = $1; - $$->array_size = $2; + $$->arrays = $2; $$->semantic = $3.semantic; $$->reg_reservation = $3.reg_reservation; } - | any_identifier array colon_attribute '=' complex_initializer + | any_identifier arrays colon_attribute '=' complex_initializer { $$ = vkd3d_calloc(1, sizeof(*$$)); $$->loc = @1; $$->name = $1; - $$->array_size = $2; + $$->arrays = $2; $$->semantic = $3.semantic; $$->reg_reservation = $3.reg_reservation; $$->initializer = $5; } -array: +arrays: %empty { - $$ = 0; + $$.sizes = NULL; + $$.count = 0; } - | '[' expr ']' + | '[' expr ']' arrays { unsigned int size = evaluate_array_dimension(node_from_list($2)); + uint32_t *new_array; hlsl_free_instr_list($2); + $$ = $4; + if (!size) { hlsl_error(ctx, @2, VKD3D_SHADER_ERROR_HLSL_INVALID_SIZE, "Array size is not a positive integer constant."); + vkd3d_free($$.sizes); YYABORT; } @@ -2299,9 +2326,17 @@ array: { hlsl_error(ctx, @2, VKD3D_SHADER_ERROR_HLSL_INVALID_SIZE, "Array size %u is not between 1 and 65536.", size); + vkd3d_free($$.sizes); YYABORT; } - $$ = size; + + if (!(new_array = vkd3d_realloc($$.sizes, ($$.count + 1) * sizeof(*new_array)))) + { + vkd3d_free($$.sizes); + YYABORT; + } + $$.sizes = new_array; + $$.sizes[$$.count++] = size; } var_modifiers: @@ -2632,6 +2667,7 @@ postfix_expr: | postfix_expr '[' expr ']' { struct hlsl_ir_node *array = node_from_list($1), *index = node_from_list($3); + struct hlsl_ir_expr *cast; list_move_tail($1, $3); vkd3d_free($3); @@ -2643,7 +2679,14 @@ postfix_expr: YYABORT; } - if (!add_array_load(ctx, $1, array, index, @2)) + if (!(cast = hlsl_new_cast(index, ctx->builtin_types.scalar[HLSL_TYPE_UINT], &index->loc))) + { + hlsl_free_instr_list($1); + YYABORT; + } + list_add_tail($1, &cast->node.entry); + + if (!add_array_load(ctx, $1, array, &cast->node, @2)) { hlsl_free_instr_list($1); YYABORT; @@ -2762,10 +2805,11 @@ unary_expr: } /* var_modifiers is necessary to avoid shift/reduce conflicts. */ - | '(' var_modifiers type array ')' unary_expr + | '(' var_modifiers type arrays ')' unary_expr { struct hlsl_type *src_type = node_from_list($6)->data_type; struct hlsl_type *dst_type; + unsigned int i; if ($2) { @@ -2774,10 +2818,9 @@ unary_expr: YYABORT; } - if ($4) - dst_type = hlsl_new_array_type(ctx, $3, $4); - else - dst_type = $3; + dst_type = $3; + for (i = 0; i < $4.count; ++i) + dst_type = hlsl_new_array_type(ctx, dst_type, $4.sizes[i]); if (!compatible_data_types(src_type, dst_type)) {

1 0

Francois Gouget : testbot/LogUtils: Simplify matching the WineRun* errors.
by Alexandre Julliard 05 Mar '21

05 Mar '21

Module: tools Branch: master Commit: 6b31b74e6e479348c1278f197da8b7dd14212a3a URL: https://source.winehq.org/git/tools.git/?a=commit;h=6b31b74e6e479348c1278f1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 5 12:17:05 2021 +0100 testbot/LogUtils: Simplify matching the WineRun* errors. They now start with the script name and the ':error:' prefix. Remove the 'Could not create' regexp since it actually corresponds to a VM-side 'Task:' error which is already taken into account. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index bdba8da..4e9b733 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -106,11 +106,8 @@ sub GetLogLineCategory($) $Line =~ /^Task: / or # Typical perl errors _IsPerlError($Line) or - # The main testbot.log errors - $Line =~ /^An error occurred while / or - $Line =~ /^Could not create / or - $Line =~ /^Giving up after \d+ run$s$$/ or - $Line =~ /^The (?:build|task) timed out$/) + # The testbot.log errors + $Line =~ /:error: /) { return "error"; }

1 0

Francois Gouget : winetest/dissect: Fix handling of subtest lines.
by Alexandre Julliard 05 Mar '21

05 Mar '21

Module: tools Branch: master Commit: 02548952b9b8001ed7e8154204651f7e64162e10 URL: https://source.winehq.org/git/tools.git/?a=commit;h=02548952b9b8001ed7e8154… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 5 12:19:51 2021 +0100 winetest/dissect: Fix handling of subtest lines. Add support for garbled subtest lines. Link to the corresponding source line. Call add_test_line() so they show up in the HTML-ized report. Let check_unit() issue an error if they are misplaced. Tweak the check_unit() message since subtest lines are not really "messages". Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 7f4f327..797c204 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -480,7 +480,7 @@ sub check_unit($$) my ($l_unit, $l_type) = @_; if (!$units{$l_unit} and !$broken) { - add_test_line("end", "Misplaced $l_type message"); + add_test_line("end", "Misplaced $l_type line"); $extra_failures++; $broken = 1; } @@ -609,19 +609,17 @@ while ($line = <IN>) { $rc = 0; } } - elsif ($line =~ /^([_.a-z0-9-]+)\.c:\d+: Subtest ([_.a-z0-9-]+)$/) + elsif (($unit ne "" and + $line =~ /^(.*?)($units_re)\.c:(\d+): (Subtest ([_.a-z0-9-]+).*)$/) or + $line =~ /^()([_a-z0-9]+)\.c:(\d+): (Subtest ([_.a-z0-9-]+).*)$/) { - my ($l_unit, $l_subunit) = ($1, $2); - if ($units{$l_unit}) - { - $units{$l_subunit} = 1; - $units_re = join("|", keys %units); - } - else - { - add_test_line("end", "$l_unit has a misplaced $l_subunit subtest line\n"); - $extra_failures++; - } + my ($pollution, $l_unit, $l_num, $l_text, $l_subunit) = ($1, $2, $3, $4, $5); + add_test_line("trace", escapeHTML($pollution) . + get_source_link($l_unit, $l_num) .": ". + escapeHTML($l_text)); + check_unit($l_unit, "subtest"); + $units{$l_subunit} = 1; + $units_re = join("|", keys %units); } elsif (($unit ne "" and $line =~ /^(.*?)($units_re)\.c:(\d+): (Test (?:failed|succeeded inside todo block): .*)$/) or

1 0