May 2024 - Wine-Commits - list.winehq.org

Zebediah Figura : vkd3d-shader/hlsl: Move the "base_type" member to the class-specific union.
by Alexandre Julliard May 6, 2024

May 6, 2024

Module: vkd3d Branch: master Commit: 2480eec98bf75fed34af39bbbe1fd9d2520ef674 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2480eec98bf75fed34af39bbbe1fd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 27 17:30:51 2024 -0600 vkd3d-shader/hlsl: Move the "base_type" member to the class-specific union. --- libs/vkd3d-shader/d3dbc.c | 10 +- libs/vkd3d-shader/fx.c | 8 +- libs/vkd3d-shader/hlsl.c | 45 +++++---- libs/vkd3d-shader/hlsl.h | 8 +- libs/vkd3d-shader/hlsl.y | 51 +++++----- libs/vkd3d-shader/hlsl_codegen.c | 64 ++++++------- libs/vkd3d-shader/hlsl_constant_ops.c | 170 +++++++++++++++++----------------- libs/vkd3d-shader/tpf.c | 74 +++++++-------- 8 files changed, 218 insertions(+), 212 deletions(-)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Use a switch in hlsl_types_are_equal().
by Alexandre Julliard May 6, 2024

May 6, 2024

Module: vkd3d Branch: master Commit: 4fd3f46109f95d6804c6f072416ef7a0c476a8d9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4fd3f46109f95d6804c6f072416ef… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 27 17:20:28 2024 -0600 vkd3d-shader/hlsl: Use a switch in hlsl_types_are_equal(). --- libs/vkd3d-shader/hlsl.c | 102 ++++++++++++++++++++++++++++------------------- 1 file changed, 60 insertions(+), 42 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index da7029c5..97da23c1 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -979,55 +979,73 @@ bool hlsl_types_are_equal(const struct hlsl_type *t1, const struct hlsl_type *t2 if (t1->class != t2->class) return false; - if (t1->base_type != t2->base_type) - return false; - if (t1->class == HLSL_CLASS_SAMPLER || t1->class == HLSL_CLASS_TEXTURE || t1->class == HLSL_CLASS_UAV) - { - if (t1->sampler_dim != t2->sampler_dim) - return false; - if ((t1->class == HLSL_CLASS_TEXTURE || t1->class == HLSL_CLASS_UAV) - && t1->sampler_dim != HLSL_SAMPLER_DIM_GENERIC - && !hlsl_types_are_equal(t1->e.resource.format, t2->e.resource.format)) - return false; - if (t1->class == HLSL_CLASS_UAV && t1->e.resource.rasteriser_ordered != t2->e.resource.rasteriser_ordered) - return false; - } - if ((t1->modifiers & HLSL_MODIFIER_ROW_MAJOR) - != (t2->modifiers & HLSL_MODIFIER_ROW_MAJOR)) - return false; - if (t1->dimx != t2->dimx) - return false; - if (t1->dimy != t2->dimy) - return false; - if (t1->class == HLSL_CLASS_STRUCT) - { - size_t i; - - if (t1->e.record.field_count != t2->e.record.field_count) - return false; - for (i = 0; i < t1->e.record.field_count; ++i) - { - const struct hlsl_struct_field *field1 = &t1->e.record.fields[i]; - const struct hlsl_struct_field *field2 = &t2->e.record.fields[i]; + switch (t1->class) + { + case HLSL_CLASS_SCALAR: + case HLSL_CLASS_VECTOR: + case HLSL_CLASS_MATRIX: + if (t1->base_type != t2->base_type) + return false; + if ((t1->modifiers & HLSL_MODIFIER_ROW_MAJOR) + != (t2->modifiers & HLSL_MODIFIER_ROW_MAJOR)) + return false; + if (t1->dimx != t2->dimx) + return false; + if (t1->dimy != t2->dimy) + return false; + return true; - if (!hlsl_types_are_equal(field1->type, field2->type)) + case HLSL_CLASS_UAV: + if (t1->e.resource.rasteriser_ordered != t2->e.resource.rasteriser_ordered) return false; + /* fall through */ + case HLSL_CLASS_TEXTURE: + if (t1->sampler_dim != HLSL_SAMPLER_DIM_GENERIC + && !hlsl_types_are_equal(t1->e.resource.format, t2->e.resource.format)) + return false; + /* fall through */ + case HLSL_CLASS_SAMPLER: + if (t1->sampler_dim != t2->sampler_dim) + return false; + return true; - if (strcmp(field1->name, field2->name)) + case HLSL_CLASS_STRUCT: + if (t1->e.record.field_count != t2->e.record.field_count) return false; - } - } - if (t1->class == HLSL_CLASS_ARRAY) - return t1->e.array.elements_count == t2->e.array.elements_count - && hlsl_types_are_equal(t1->e.array.type, t2->e.array.type); - if (t1->class == HLSL_CLASS_TECHNIQUE) - { - if (t1->e.version != t2->e.version) - return false; + + for (size_t i = 0; i < t1->e.record.field_count; ++i) + { + const struct hlsl_struct_field *field1 = &t1->e.record.fields[i]; + const struct hlsl_struct_field *field2 = &t2->e.record.fields[i]; + + if (!hlsl_types_are_equal(field1->type, field2->type)) + return false; + + if (strcmp(field1->name, field2->name)) + return false; + } + return true; + + case HLSL_CLASS_ARRAY: + return t1->e.array.elements_count == t2->e.array.elements_count + && hlsl_types_are_equal(t1->e.array.type, t2->e.array.type); + + case HLSL_CLASS_TECHNIQUE: + return t1->e.version == t2->e.version; + + case HLSL_CLASS_DEPTH_STENCIL_VIEW: + case HLSL_CLASS_EFFECT_GROUP: + case HLSL_CLASS_PASS: + case HLSL_CLASS_PIXEL_SHADER: + case HLSL_CLASS_RENDER_TARGET_VIEW: + case HLSL_CLASS_STRING: + case HLSL_CLASS_VERTEX_SHADER: + case HLSL_CLASS_VOID: + return true; } - return true; + vkd3d_unreachable(); } struct hlsl_type *hlsl_type_clone(struct hlsl_ctx *ctx, struct hlsl_type *old,

1 0

Zebediah Figura : vkd3d-shader/hlsl: Make HLSL_TYPE_VERTEXSHADER into a separate class.
by Alexandre Julliard May 6, 2024

May 6, 2024

Module: vkd3d Branch: master Commit: 874937dab48aedbef1fa99cb2fa60fdcc0d804ac URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/874937dab48aedbef1fa99cb2fa60… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 6 17:33:26 2024 -0600 vkd3d-shader/hlsl: Make HLSL_TYPE_VERTEXSHADER into a separate class. --- libs/vkd3d-shader/d3dbc.c | 6 ++++-- libs/vkd3d-shader/fx.c | 24 +++++++++++++++++------- libs/vkd3d-shader/hlsl.c | 7 ++++++- libs/vkd3d-shader/hlsl.h | 2 +- libs/vkd3d-shader/hlsl_codegen.c | 1 + libs/vkd3d-shader/tpf.c | 1 + 6 files changed, 30 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index aa235844..145ebd85 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -1518,6 +1518,7 @@ D3DXPARAMETER_CLASS hlsl_sm1_class(const struct hlsl_type *type) case HLSL_CLASS_SAMPLER: case HLSL_CLASS_STRING: case HLSL_CLASS_TEXTURE: + case HLSL_CLASS_VERTEX_SHADER: return D3DXPC_OBJECT; case HLSL_CLASS_DEPTH_STENCIL_VIEW: case HLSL_CLASS_EFFECT_GROUP: @@ -1605,8 +1606,6 @@ D3DXPARAMETER_TYPE hlsl_sm1_base_type(const struct hlsl_type *type) { case HLSL_TYPE_PIXELSHADER: return D3DXPT_PIXELSHADER; - case HLSL_TYPE_VERTEXSHADER: - return D3DXPT_VERTEXSHADER; default: vkd3d_unreachable(); } @@ -1621,6 +1620,9 @@ D3DXPARAMETER_TYPE hlsl_sm1_base_type(const struct hlsl_type *type) case HLSL_CLASS_STRING: return D3DXPT_STRING; + case HLSL_CLASS_VERTEX_SHADER: + return D3DXPT_VERTEXSHADER; + case HLSL_CLASS_DEPTH_STENCIL_VIEW: case HLSL_CLASS_EFFECT_GROUP: case HLSL_CLASS_PASS: diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index 168378e6..4f94f428 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -352,7 +352,6 @@ static const char * get_fx_4_type_name(const struct hlsl_type *type) static const char * const object_type_names[] = { [HLSL_TYPE_PIXELSHADER] = "PixelShader", - [HLSL_TYPE_VERTEXSHADER] = "VertexShader", }; static const char * const texture_type_names[] = { @@ -392,11 +391,13 @@ static const char * get_fx_4_type_name(const struct hlsl_type *type) case HLSL_CLASS_RENDER_TARGET_VIEW: return "RenderTargetView"; + case HLSL_CLASS_VERTEX_SHADER: + return "VertexShader"; + case HLSL_CLASS_OBJECT: switch (type->base_type) { case HLSL_TYPE_PIXELSHADER: - case HLSL_TYPE_VERTEXSHADER: return object_type_names[type->base_type]; default: return type->name; @@ -440,6 +441,7 @@ static uint32_t write_fx_4_type(const struct hlsl_type *type, struct fx_write_co case HLSL_CLASS_RENDER_TARGET_VIEW: case HLSL_CLASS_TEXTURE: case HLSL_CLASS_UAV: + case HLSL_CLASS_VERTEX_SHADER: put_u32_unaligned(buffer, 2); break; @@ -532,18 +534,20 @@ static uint32_t write_fx_4_type(const struct hlsl_type *type, struct fx_write_co { put_u32_unaligned(buffer, 19); } + else if (type->class == HLSL_CLASS_VERTEX_SHADER) + { + put_u32_unaligned(buffer, 6); + } else if (type->class == HLSL_CLASS_OBJECT) { static const uint32_t object_type[] = { [HLSL_TYPE_PIXELSHADER] = 5, - [HLSL_TYPE_VERTEXSHADER] = 6, }; switch (type->base_type) { case HLSL_TYPE_PIXELSHADER: - case HLSL_TYPE_VERTEXSHADER: put_u32_unaligned(buffer, object_type[type->base_type]); break; default: @@ -842,7 +846,6 @@ static bool is_type_supported_fx_2(struct hlsl_ctx *ctx, const struct hlsl_type switch (type->base_type) { case HLSL_TYPE_PIXELSHADER: - case HLSL_TYPE_VERTEXSHADER: hlsl_fixme(ctx, loc, "Write fx 2.0 parameter object type %#x.", type->base_type); return false; @@ -852,6 +855,7 @@ static bool is_type_supported_fx_2(struct hlsl_ctx *ctx, const struct hlsl_type case HLSL_CLASS_SAMPLER: case HLSL_CLASS_STRING: + case HLSL_CLASS_VERTEX_SHADER: hlsl_fixme(ctx, loc, "Write fx 2.0 parameter class %#x.", type->class); return false; @@ -1052,7 +1056,6 @@ static void write_fx_4_object_variable(struct hlsl_ir_var *var, struct fx_write_ switch (type->base_type) { case HLSL_TYPE_PIXELSHADER: - case HLSL_TYPE_VERTEXSHADER: /* FIXME: write shader blobs, once parser support works. */ for (i = 0; i < elements_count; ++i) put_u32(buffer, 0); @@ -1064,6 +1067,13 @@ static void write_fx_4_object_variable(struct hlsl_ir_var *var, struct fx_write_ } break; + case HLSL_CLASS_VERTEX_SHADER: + /* FIXME: write shader blobs, once parser support works. */ + for (i = 0; i < elements_count; ++i) + put_u32(buffer, 0); + ++fx->shader_variable_count; + break; + default: hlsl_fixme(ctx, &ctx->location, "Writing initializer for object type %u is not implemented.", type->base_type); @@ -1153,13 +1163,13 @@ static bool is_object_variable(const struct hlsl_ir_var *var) case HLSL_CLASS_SAMPLER: case HLSL_CLASS_TEXTURE: case HLSL_CLASS_UAV: + case HLSL_CLASS_VERTEX_SHADER: return true; case HLSL_CLASS_OBJECT: switch (type->base_type) { case HLSL_TYPE_PIXELSHADER: - case HLSL_TYPE_VERTEXSHADER: return true; default: return false; diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 0b48b17d..20ae3a64 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -370,6 +370,7 @@ static void hlsl_type_calculate_reg_size(struct hlsl_ctx *ctx, struct hlsl_type case HLSL_CLASS_RENDER_TARGET_VIEW: case HLSL_CLASS_STRING: case HLSL_CLASS_TECHNIQUE: + case HLSL_CLASS_VERTEX_SHADER: case HLSL_CLASS_VOID: break; } @@ -438,6 +439,7 @@ static bool type_is_single_component(const struct hlsl_type *type) case HLSL_CLASS_RENDER_TARGET_VIEW: case HLSL_CLASS_TEXTURE: case HLSL_CLASS_UAV: + case HLSL_CLASS_VERTEX_SHADER: return true; case HLSL_CLASS_VECTOR: @@ -578,6 +580,7 @@ unsigned int hlsl_type_get_component_offset(struct hlsl_ctx *ctx, struct hlsl_ty case HLSL_CLASS_STRING: case HLSL_CLASS_TEXTURE: case HLSL_CLASS_UAV: + case HLSL_CLASS_VERTEX_SHADER: assert(idx == 0); break; @@ -956,6 +959,7 @@ unsigned int hlsl_type_component_count(const struct hlsl_type *type) case HLSL_CLASS_STRING: case HLSL_CLASS_TEXTURE: case HLSL_CLASS_UAV: + case HLSL_CLASS_VERTEX_SHADER: return 1; case HLSL_CLASS_EFFECT_GROUP: @@ -2382,6 +2386,7 @@ struct vkd3d_string_buffer *hlsl_type_to_string(struct hlsl_ctx *ctx, const stru case HLSL_CLASS_SAMPLER: case HLSL_CLASS_STRING: case HLSL_CLASS_TECHNIQUE: + case HLSL_CLASS_VERTEX_SHADER: case HLSL_CLASS_VOID: break; } @@ -3558,7 +3563,6 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) {"vector", HLSL_CLASS_VECTOR, HLSL_TYPE_FLOAT, 4, 1}, {"matrix", HLSL_CLASS_MATRIX, HLSL_TYPE_FLOAT, 4, 4}, {"pixelshader", HLSL_CLASS_OBJECT, HLSL_TYPE_PIXELSHADER, 1, 1}, - {"vertexshader", HLSL_CLASS_OBJECT, HLSL_TYPE_VERTEXSHADER, 1, 1}, }; static const struct @@ -3685,6 +3689,7 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) hlsl_scope_add_type(ctx->globals, hlsl_new_simple_type(ctx, "RenderTargetView", HLSL_CLASS_RENDER_TARGET_VIEW)); hlsl_scope_add_type(ctx->globals, hlsl_new_simple_type(ctx, "STRING", HLSL_CLASS_STRING)); hlsl_scope_add_type(ctx->globals, hlsl_new_simple_type(ctx, "texture", HLSL_CLASS_TEXTURE)); + hlsl_scope_add_type(ctx->globals, hlsl_new_simple_type(ctx, "vertexshader", HLSL_CLASS_VERTEX_SHADER)); for (i = 0; i < ARRAY_SIZE(effect_types); ++i) { diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index ec3f5826..ac8ccd61 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -88,6 +88,7 @@ enum hlsl_type_class HLSL_CLASS_TECHNIQUE, HLSL_CLASS_TEXTURE, HLSL_CLASS_UAV, + HLSL_CLASS_VERTEX_SHADER, HLSL_CLASS_VOID, }; @@ -101,7 +102,6 @@ enum hlsl_base_type HLSL_TYPE_BOOL, HLSL_TYPE_LAST_SCALAR = HLSL_TYPE_BOOL, HLSL_TYPE_PIXELSHADER, - HLSL_TYPE_VERTEXSHADER, }; enum hlsl_sampler_dim diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 94acb70f..ff114c32 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1628,6 +1628,7 @@ static bool copy_propagation_transform_load(struct hlsl_ctx *ctx, case HLSL_CLASS_SAMPLER: case HLSL_CLASS_TEXTURE: case HLSL_CLASS_UAV: + case HLSL_CLASS_VERTEX_SHADER: case HLSL_CLASS_OBJECT: break; diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 708ab626..ffc0d9d5 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3017,6 +3017,7 @@ static D3D_SHADER_VARIABLE_CLASS sm4_class(const struct hlsl_type *type) case HLSL_CLASS_TECHNIQUE: case HLSL_CLASS_TEXTURE: case HLSL_CLASS_UAV: + case HLSL_CLASS_VERTEX_SHADER: case HLSL_CLASS_VOID: break; }

1 0

Zebediah Figura : vkd3d-shader/hlsl: Ensure that the type is numeric before calling expr_common_base_type().
by Alexandre Julliard May 6, 2024

May 6, 2024

Module: vkd3d Branch: master Commit: e904b4596a2f7d0b83d203cd03c5bec14f14c5e0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e904b4596a2f7d0b83d203cd03c5b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 7 13:37:53 2024 -0600 vkd3d-shader/hlsl: Ensure that the type is numeric before calling expr_common_base_type(). --- libs/vkd3d-shader/hlsl.y | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 0eed15c5..930929ad 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1386,10 +1386,6 @@ static bool expr_compatible_data_types(struct hlsl_type *t1, struct hlsl_type *t static enum hlsl_base_type expr_common_base_type(enum hlsl_base_type t1, enum hlsl_base_type t2) { - if (t1 > HLSL_TYPE_LAST_SCALAR || t2 > HLSL_TYPE_LAST_SCALAR) { - FIXME("Unexpected base type.\n"); - return HLSL_TYPE_FLOAT; - } if (t1 == t2) return t1 == HLSL_TYPE_BOOL ? HLSL_TYPE_INT : t1; if (t1 == HLSL_TYPE_DOUBLE || t2 == HLSL_TYPE_DOUBLE) @@ -1593,13 +1589,13 @@ static struct hlsl_ir_node *add_unary_logical_expr(struct hlsl_ctx *ctx, struct static struct hlsl_type *get_common_numeric_type(struct hlsl_ctx *ctx, const struct hlsl_ir_node *arg1, const struct hlsl_ir_node *arg2, const struct vkd3d_shader_location *loc) { - enum hlsl_base_type base = expr_common_base_type(arg1->data_type->base_type, arg2->data_type->base_type); enum hlsl_type_class type; + enum hlsl_base_type base; unsigned int dimx, dimy; if (!expr_common_shape(ctx, arg1->data_type, arg2->data_type, loc, &type, &dimx, &dimy)) return NULL; - + base = expr_common_base_type(arg1->data_type->base_type, arg2->data_type->base_type); return hlsl_get_numeric_type(ctx, type, base, dimx, dimy); } @@ -1636,14 +1632,15 @@ static struct hlsl_ir_node *add_binary_comparison_expr(struct hlsl_ctx *ctx, str const struct vkd3d_shader_location *loc) { struct hlsl_type *common_type, *return_type; - enum hlsl_base_type base = expr_common_base_type(arg1->data_type->base_type, arg2->data_type->base_type); enum hlsl_type_class type; + enum hlsl_base_type base; unsigned int dimx, dimy; struct hlsl_ir_node *args[HLSL_MAX_OPERANDS] = {0}; if (!expr_common_shape(ctx, arg1->data_type, arg2->data_type, loc, &type, &dimx, &dimy)) return NULL; + base = expr_common_base_type(arg1->data_type->base_type, arg2->data_type->base_type); common_type = hlsl_get_numeric_type(ctx, type, base, dimx, dimy); return_type = hlsl_get_numeric_type(ctx, type, HLSL_TYPE_BOOL, dimx, dimy);

1 0

Zebediah Figura : vkd3d-shader/hlsl: Make HLSL_TYPE_PIXELSHADER into a separate class.
by Alexandre Julliard May 6, 2024

May 6, 2024

Module: vkd3d Branch: master Commit: d9f7a883295141a35de9a7e0b4e6c2d2744c525e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d9f7a883295141a35de9a7e0b4e6c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 6 19:41:15 2024 -0600 vkd3d-shader/hlsl: Make HLSL_TYPE_PIXELSHADER into a separate class. --- libs/vkd3d-shader/d3dbc.c | 15 +++----- libs/vkd3d-shader/fx.c | 76 ++++++---------------------------------- libs/vkd3d-shader/hlsl.c | 12 +++---- libs/vkd3d-shader/hlsl.h | 4 +-- libs/vkd3d-shader/hlsl_codegen.c | 2 +- libs/vkd3d-shader/tpf.c | 2 +- 6 files changed, 23 insertions(+), 88 deletions(-)

1 0

Fotios Valasiadis : ntdll/unix: Fix building on musl by explicitly including asm/ioctls.h.
by Alexandre Julliard May 6, 2024

May 6, 2024

Module: wine Branch: master Commit: 24ca848c568d5a2786abd26f2e7314b2e3f509f3 URL: https://gitlab.winehq.org/wine/wine/-/commit/24ca848c568d5a2786abd26f2e7314… Author: Fotios Valasiadis <fvalasiad(a)gmail.com> Date: Sun May 5 03:34:57 2024 +0300 ntdll/unix: Fix building on musl by explicitly including asm/ioctls.h. After commit 898ab8dab19d498c17859f39a55e317ee7e367a5 wine would no longer build on musl. Issue is that apparently TCSETS2 isn't defined when including sys/ioctl.h. A little digging shows that glibc goes ahead and includes asm/ioctls.h in sys/ioctl.h, providing said macro. Musl on the other hand doesn't and relies on bits/ioctl.h, which lacks said macro. Signed-off-by: Fotios Valasiadis <fvalasiad(a)gmail.com> --- dlls/ntdll/unix/serial.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/unix/serial.c b/dlls/ntdll/unix/serial.c index d48c49c87f6..bb8d52cc627 100644 --- a/dlls/ntdll/unix/serial.c +++ b/dlls/ntdll/unix/serial.c @@ -33,6 +33,7 @@ #include <stdio.h> #ifdef HAVE_ASM_TERMBITS_H # include <asm/termbits.h> +# include <asm/ioctls.h> #else # include <termios.h> #endif

1 0

Billy Laws : ntdll: Allocate wow64 environment block within the 32-bit address space.
by Alexandre Julliard May 6, 2024

May 6, 2024

Module: wine Branch: master Commit: 79fb59e21ed9da33b2dccdfca3f001ef54723555 URL: https://gitlab.winehq.org/wine/wine/-/commit/79fb59e21ed9da33b2dccdfca3f001… Author: Billy Laws <blaws05(a)gmail.com> Date: Wed Apr 17 18:27:56 2024 +0000 ntdll: Allocate wow64 environment block within the 32-bit address space. --- dlls/ntdll/unix/env.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index ad9ab0dc220..b15db0ec23c 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1815,7 +1815,7 @@ static void *build_wow64_parameters( const RTL_USER_PROCESS_PARAMETERS *params ) + ((params->RuntimeInfo.MaximumLength + 1) & ~1) + params->EnvironmentSize); - status = NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&wow64_params, 0, &size, + status = NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&wow64_params, limit_2g - 1, &size, MEM_COMMIT, PAGE_READWRITE ); assert( !status );

1 0

Biswapriyo Nath : include: Avoid a C++ keyword.
by Alexandre Julliard May 6, 2024

May 6, 2024

Module: wine Branch: master Commit: 469a4837bc00954c6c90a632658785eaacd961f3 URL: https://gitlab.winehq.org/wine/wine/-/commit/469a4837bc00954c6c90a632658785… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Sun May 5 04:53:03 2024 +0000 include: Avoid a C++ keyword. This fixes the following C++ compiler error mfmediaengine.h:1216:18: error: expected ',' or '...' before 'protected' 1216 | BOOL *protected) = 0; | ^~~~~~~~~ --- include/mfmediaengine.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/mfmediaengine.idl b/include/mfmediaengine.idl index 6547ef87462..27b6bbcd7d7 100644 --- a/include/mfmediaengine.idl +++ b/include/mfmediaengine.idl @@ -305,7 +305,7 @@ interface IMFMediaEngineEx : IMFMediaEngine HRESULT GetStreamSelection([in] DWORD stream_index, [out] BOOL *enabled); HRESULT SetStreamSelection([in] DWORD stream_index, [in] BOOL enabled); HRESULT ApplyStreamSelections(); - HRESULT IsProtected([out] BOOL *protected); + HRESULT IsProtected([out] BOOL *is_protected); HRESULT InsertVideoEffect([in] IUnknown *effect, [in] BOOL is_optional); HRESULT InsertAudioEffect([in] IUnknown *effect, [in] BOOL is_optional); HRESULT RemoveAllEffects();

1 0

Conor McCarthy : vkd3d-shader/spirv: Implement the WAVE_OP_* instructions.
by Alexandre Julliard May 6, 2024

May 6, 2024

Module: vkd3d Branch: master Commit: cfcc789b42ea707ed701cbcb0600be6156cfbbb1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/cfcc789b42ea707ed701cbcb0600b… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Apr 23 21:35:27 2024 +1000 vkd3d-shader/spirv: Implement the WAVE_OP_* instructions. --- libs/vkd3d-shader/spirv.c | 26 +++++++++++++++++++++++++- tests/hlsl/wave-ops-float.shader_test | 12 ++++++------ tests/hlsl/wave-ops-int.shader_test | 4 ++-- tests/hlsl/wave-ops-uint.shader_test | 6 +++--- tests/hlsl/wave-reconvergence.shader_test | 4 ++-- 5 files changed, 38 insertions(+), 14 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 60c08be2..7ac9f3cd 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -9826,6 +9826,22 @@ static SpvOp map_wave_alu_op(enum vkd3d_shader_opcode handler_idx, bool is_float return SpvOpGroupNonUniformBitwiseOr; case VKD3DSIH_WAVE_ACTIVE_BIT_XOR: return SpvOpGroupNonUniformBitwiseXor; + case VKD3DSIH_WAVE_OP_ADD: + return is_float ? SpvOpGroupNonUniformFAdd : SpvOpGroupNonUniformIAdd; + case VKD3DSIH_WAVE_OP_IMAX: + return SpvOpGroupNonUniformSMax; + case VKD3DSIH_WAVE_OP_IMIN: + return SpvOpGroupNonUniformSMin; + case VKD3DSIH_WAVE_OP_MAX: + return SpvOpGroupNonUniformFMax; + case VKD3DSIH_WAVE_OP_MIN: + return SpvOpGroupNonUniformFMin; + case VKD3DSIH_WAVE_OP_MUL: + return is_float ? SpvOpGroupNonUniformFMul : SpvOpGroupNonUniformIMul; + case VKD3DSIH_WAVE_OP_UMAX: + return SpvOpGroupNonUniformUMax; + case VKD3DSIH_WAVE_OP_UMIN: + return SpvOpGroupNonUniformUMin; default: vkd3d_unreachable(); } @@ -9849,7 +9865,7 @@ static void spirv_compiler_emit_wave_alu_op(struct spirv_compiler *compiler, vkd3d_spirv_enable_capability(builder, SpvCapabilityGroupNonUniformArithmetic); val_id = vkd3d_spirv_build_op_tr3(builder, &builder->function_stream, op, type_id, vkd3d_spirv_get_op_scope_subgroup(builder), - SpvGroupOperationReduce, + (instruction->flags & VKD3DSI_WAVE_PREFIX) ? SpvGroupOperationExclusiveScan : SpvGroupOperationReduce, val_id); spirv_compiler_emit_store_dst(compiler, dst, val_id); @@ -10210,6 +10226,14 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, case VKD3DSIH_WAVE_ACTIVE_BIT_AND: case VKD3DSIH_WAVE_ACTIVE_BIT_OR: case VKD3DSIH_WAVE_ACTIVE_BIT_XOR: + case VKD3DSIH_WAVE_OP_ADD: + case VKD3DSIH_WAVE_OP_IMAX: + case VKD3DSIH_WAVE_OP_IMIN: + case VKD3DSIH_WAVE_OP_MAX: + case VKD3DSIH_WAVE_OP_MIN: + case VKD3DSIH_WAVE_OP_MUL: + case VKD3DSIH_WAVE_OP_UMAX: + case VKD3DSIH_WAVE_OP_UMIN: spirv_compiler_emit_wave_alu_op(compiler, instruction); break; case VKD3DSIH_DCL: diff --git a/tests/hlsl/wave-ops-float.shader_test b/tests/hlsl/wave-ops-float.shader_test index 2c402db1..60774fa8 100644 --- a/tests/hlsl/wave-ops-float.shader_test +++ b/tests/hlsl/wave-ops-float.shader_test @@ -133,7 +133,7 @@ void main(uint id : SV_GroupIndex) } [test] -todo dispatch 4 1 1 +dispatch 4 1 1 probe uav 1 (0) rgba (14.0, 4.5, 16.5, 10.0) probe uav 1 (1) rgba (14.0, 4.5, 16.5, 10.0) probe uav 1 (2) rgba (14.0, 4.5, 16.5, 10.0) @@ -151,7 +151,7 @@ void main(uint id : SV_GroupIndex) } [test] -todo dispatch 4 1 1 +dispatch 4 1 1 probe uav 1 (0) rgba (150.0625, 1.5, 288.0, 39.0625) probe uav 1 (1) rgba (150.0625, 1.5, 288.0, 39.0625) probe uav 1 (2) rgba (150.0625, 1.5, 288.0, 39.0625) @@ -169,7 +169,7 @@ void main(uint id : SV_GroupIndex) } [test] -todo dispatch 4 1 1 +dispatch 4 1 1 probe uav 1 (0) rgba (3.5, 1.0, 4.0, 2.5) probe uav 1 (1) rgba (3.5, 1.0, 4.0, 2.5) probe uav 1 (2) rgba (3.5, 1.0, 4.0, 2.5) @@ -187,7 +187,7 @@ void main(uint id : SV_GroupIndex) } [test] -todo dispatch 4 1 1 +dispatch 4 1 1 probe uav 1 (0) rgba (3.5, 1.5, 4.5, 2.5) probe uav 1 (1) rgba (3.5, 1.5, 4.5, 2.5) probe uav 1 (2) rgba (3.5, 1.5, 4.5, 2.5) @@ -205,7 +205,7 @@ void main(uint id : SV_GroupIndex) } [test] -todo dispatch 4 1 1 +dispatch 4 1 1 probe uav 1 (0) rgba (0.0, 0.0, 0.0, 0.0) probe uav 1 (1) rgba (3.5, 1.0, 4.0, 2.5) probe uav 1 (2) rgba (7.0, 2.0, 8.0, 5.0) @@ -223,7 +223,7 @@ void main(uint id : SV_GroupIndex) } [test] -todo dispatch 4 1 1 +dispatch 4 1 1 probe uav 1 (0) rgba (1.0, 1.0, 1.0, 1.0) probe uav 1 (1) rgba (3.5, 1.0, 4.0, 2.5) probe uav 1 (2) rgba (12.25, 1.0, 16.0, 6.25) diff --git a/tests/hlsl/wave-ops-int.shader_test b/tests/hlsl/wave-ops-int.shader_test index 5c9a365f..bc6976ba 100644 --- a/tests/hlsl/wave-ops-int.shader_test +++ b/tests/hlsl/wave-ops-int.shader_test @@ -31,7 +31,7 @@ void main(uint id : SV_GroupIndex) } [test] -todo dispatch 4 1 1 +dispatch 4 1 1 probe uav 1 (0) rgbai (-3, 1, -4, 2) probe uav 1 (1) rgbai (-3, 1, -4, 2) probe uav 1 (2) rgbai (-3, 1, -4, 2) @@ -49,7 +49,7 @@ void main(uint id : SV_GroupIndex) } [test] -todo dispatch 4 1 1 +dispatch 4 1 1 probe uav 1 (0) rgbai (3, 5, -1, 2) probe uav 1 (1) rgbai (3, 5, -1, 2) probe uav 1 (2) rgbai (3, 5, -1, 2) diff --git a/tests/hlsl/wave-ops-uint.shader_test b/tests/hlsl/wave-ops-uint.shader_test index cb502e86..c16adab4 100644 --- a/tests/hlsl/wave-ops-uint.shader_test +++ b/tests/hlsl/wave-ops-uint.shader_test @@ -101,7 +101,7 @@ void main(uint id : SV_GroupIndex) } [test] -todo dispatch 4 1 1 +dispatch 4 1 1 probe uav 1 (0) rui (8) probe uav 1 (1) rui (8) probe uav 1 (2) rui (8) @@ -214,7 +214,7 @@ void main(uint id : SV_GroupIndex) } [test] -todo dispatch 4 1 1 +dispatch 4 1 1 probe uav 1 (0) rui (41) probe uav 1 (1) rui (41) probe uav 1 (2) rui (41) @@ -298,7 +298,7 @@ void main(uint id : SV_GroupIndex) [test] uniform 0 uint4 1 5 0 0 -todo dispatch 4 1 1 +dispatch 4 1 1 probe uav 1 (0) rui (29) probe uav 1 (1) rui (29) probe uav 1 (2) rui (29) diff --git a/tests/hlsl/wave-reconvergence.shader_test b/tests/hlsl/wave-reconvergence.shader_test index 66698da8..0a1da3ee 100644 --- a/tests/hlsl/wave-reconvergence.shader_test +++ b/tests/hlsl/wave-reconvergence.shader_test @@ -56,7 +56,7 @@ void main(uint id : SV_GroupIndex) } [test] -todo dispatch 4 1 1 +dispatch 4 1 1 probe uav 2 (0) rui (0xf01) probe uav 2 (1) rui (0x503) probe uav 2 (2) rui (0x511) @@ -124,7 +124,7 @@ void main(uint id : SV_GroupIndex) } [test] -todo dispatch 4 1 1 +dispatch 4 1 1 probe uav 2 (0) rui (0x701) probe uav 2 (1) rui (0x503) probe uav 2 (2) rui (0x511)

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement DX intrinsic WaveActiveBit.
by Alexandre Julliard May 6, 2024

May 6, 2024

Module: vkd3d Branch: master Commit: af208135f372632efaad63c463a7a403cde51db5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/af208135f372632efaad63c463a7a… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Apr 23 21:10:24 2024 +1000 vkd3d-shader/dxil: Implement DX intrinsic WaveActiveBit. --- libs/vkd3d-shader/d3d_asm.c | 3 ++ libs/vkd3d-shader/dxil.c | 49 ++++++++++++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 3 ++ 3 files changed, 55 insertions(+) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index 0e182506..4961fcf5 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -329,6 +329,9 @@ static const char * const shader_opcode_names[] = [VKD3DSIH_UTOU ] = "utou", [VKD3DSIH_WAVE_ACTIVE_ALL_EQUAL ] = "wave_active_all_equal", [VKD3DSIH_WAVE_ACTIVE_BALLOT ] = "wave_active_ballot", + [VKD3DSIH_WAVE_ACTIVE_BIT_AND ] = "wave_active_bit_and", + [VKD3DSIH_WAVE_ACTIVE_BIT_OR ] = "wave_active_bit_or", + [VKD3DSIH_WAVE_ACTIVE_BIT_XOR ] = "wave_active_bit_xor", [VKD3DSIH_WAVE_ALL_TRUE ] = "wave_all_true", [VKD3DSIH_WAVE_ANY_TRUE ] = "wave_any_true", [VKD3DSIH_XOR ] = "xor", diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 048281ee..622c1ee8 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -433,6 +433,7 @@ enum dx_intrinsic_opcode DX_WAVE_ALL_TRUE = 114, DX_WAVE_ACTIVE_ALL_EQUAL = 115, DX_WAVE_ACTIVE_BALLOT = 116, + DX_WAVE_ACTIVE_BIT = 120, DX_LEGACY_F32TOF16 = 130, DX_LEGACY_F16TOF32 = 131, DX_RAW_BUFFER_LOAD = 139, @@ -534,6 +535,13 @@ enum dxil_sync_flags SYNC_GROUP_SHARED_MEMORY = 0x8, }; +enum dxil_wave_bit_op_kind +{ + WAVE_BIT_OP_AND = 0, + WAVE_BIT_OP_OR = 1, + WAVE_BIT_OP_XOR = 2, +}; + struct sm6_pointer_info { const struct sm6_type *type; @@ -5925,6 +5933,46 @@ static void sm6_parser_emit_dx_wave_active_ballot(struct sm6_parser *sm6, enum d instruction_dst_param_init_ssa_vector(ins, VKD3D_VEC4_SIZE, sm6); } +static enum vkd3d_shader_opcode sm6_dx_map_wave_bit_op(enum dxil_wave_bit_op_kind op, + struct sm6_parser *sm6) +{ + switch (op) + { + case WAVE_BIT_OP_AND: + return VKD3DSIH_WAVE_ACTIVE_BIT_AND; + case WAVE_BIT_OP_OR: + return VKD3DSIH_WAVE_ACTIVE_BIT_OR; + case WAVE_BIT_OP_XOR: + return VKD3DSIH_WAVE_ACTIVE_BIT_XOR; + default: + FIXME("Unhandled wave bit op %u.\n", op); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_UNHANDLED_INTRINSIC, + "Wave bit operation %u is unhandled.\n", op); + return VKD3DSIH_INVALID; + } +} + +static void sm6_parser_emit_dx_wave_active_bit(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, + const struct sm6_value **operands, struct function_emission_state *state) +{ + struct vkd3d_shader_instruction *ins = state->ins; + struct vkd3d_shader_src_param *src_param; + enum dxil_wave_bit_op_kind wave_op; + enum vkd3d_shader_opcode opcode; + + wave_op = sm6_value_get_constant_uint(operands[1]); + + if ((opcode = sm6_dx_map_wave_bit_op(wave_op, sm6)) == VKD3DSIH_INVALID) + return; + vsir_instruction_init(ins, &sm6->p.location, opcode); + + if (!(src_param = instruction_src_params_alloc(ins, 1, sm6))) + return; + src_param_init_from_value(src_param, operands[0]); + + instruction_dst_param_init_ssa_scalar(ins, sm6); +} + static void sm6_parser_emit_dx_wave_builtin(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, const struct sm6_value **operands, struct function_emission_state *state) { @@ -6068,6 +6116,7 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_UMIN ] = {"m", "RR", sm6_parser_emit_dx_binary}, [DX_WAVE_ACTIVE_ALL_EQUAL ] = {"1", "n", sm6_parser_emit_dx_unary}, [DX_WAVE_ACTIVE_BALLOT ] = {"V", "1", sm6_parser_emit_dx_wave_active_ballot}, + [DX_WAVE_ACTIVE_BIT ] = {"m", "Rc", sm6_parser_emit_dx_wave_active_bit}, [DX_WAVE_ALL_TRUE ] = {"1", "1", sm6_parser_emit_dx_unary}, [DX_WAVE_ANY_TRUE ] = {"1", "1", sm6_parser_emit_dx_unary}, [DX_WAVE_GET_LANE_COUNT ] = {"i", "", sm6_parser_emit_dx_wave_builtin}, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 14d27c11..7747a422 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -529,6 +529,9 @@ enum vkd3d_shader_opcode VKD3DSIH_UTOU, VKD3DSIH_WAVE_ACTIVE_ALL_EQUAL, VKD3DSIH_WAVE_ACTIVE_BALLOT, + VKD3DSIH_WAVE_ACTIVE_BIT_AND, + VKD3DSIH_WAVE_ACTIVE_BIT_OR, + VKD3DSIH_WAVE_ACTIVE_BIT_XOR, VKD3DSIH_WAVE_ALL_TRUE, VKD3DSIH_WAVE_ANY_TRUE, VKD3DSIH_XOR,

1 0