November 2023 - Wine-commits

Conor McCarthy : vkd3d-shader/spirv: Support VKD3D_DATA_UINT in spirv_compiler_emit_neg().
by Alexandre Julliard 06 Nov '23

06 Nov '23

Module: vkd3d Branch: master Commit: 3e0638148afdcd8a683dd541e4d213929e62fd7e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3e0638148afdcd8a683dd541e4d21… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jun 6 00:21:13 2023 +1000 vkd3d-shader/spirv: Support VKD3D_DATA_UINT in spirv_compiler_emit_neg(). The DXIL parser uses unsigned types even if the source code uses signed, so unsigned values may be negated. --- libs/vkd3d-shader/spirv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index e508ca27..a25edb64 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3865,7 +3865,7 @@ static uint32_t spirv_compiler_emit_neg(struct spirv_compiler *compiler, type_id = spirv_compiler_get_type_id_for_reg(compiler, reg, write_mask); if (reg->data_type == VKD3D_DATA_FLOAT || reg->data_type == VKD3D_DATA_DOUBLE) return vkd3d_spirv_build_op_fnegate(builder, type_id, val_id); - else if (reg->data_type == VKD3D_DATA_INT) + else if (reg->data_type == VKD3D_DATA_INT || reg->data_type == VKD3D_DATA_UINT) return vkd3d_spirv_build_op_snegate(builder, type_id, val_id); FIXME("Unhandled data type %#x.\n", reg->data_type);

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement the DXIL BINOP instruction.
by Alexandre Julliard 06 Nov '23

06 Nov '23

Module: vkd3d Branch: master Commit: 749df8dec23b8b8e4085a81beeff17692c41b294 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/749df8dec23b8b8e4085a81beeff1… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Oct 16 15:41:17 2023 +1000 vkd3d-shader/dxil: Implement the DXIL BINOP instruction. --- libs/vkd3d-shader/dxil.c | 228 ++++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + tests/hlsl/arithmetic-float-uniform.shader_test | 14 +- tests/hlsl/cbuffer.shader_test | 6 +- tests/hlsl/const.shader_test | 2 +- tests/hlsl/cross.shader_test | 4 +- tests/hlsl/dot.shader_test | 2 +- tests/hlsl/expr-indexing.shader_test | 2 +- tests/hlsl/lerp.shader_test | 2 +- tests/hlsl/loop.shader_test | 10 +- tests/hlsl/math.shader_test | 2 +- tests/hlsl/object-references.shader_test | 2 +- tests/hlsl/reflect.shader_test | 2 +- tests/hlsl/writemask-assignop-0.shader_test | 2 +- tests/hlsl/writemask-assignop-1.shader_test | 2 +- 15 files changed, 256 insertions(+), 25 deletions(-)

1 0

Francisco Casas : vkd3d-shader/tpf: Don't pass 0x4 as mask for vec4 constant src registers.
by Alexandre Julliard 06 Nov '23

06 Nov '23

Module: vkd3d Branch: master Commit: 98b5eb474a0e583e7381cd8638d435fe7d77ebd0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/98b5eb474a0e583e7381cd8638d43… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Nov 1 20:50:33 2023 -0300 vkd3d-shader/tpf: Don't pass 0x4 as mask for vec4 constant src registers. Co-authored-by: Evan Tang <etang(a)codeweavers.com> Evan Tang reported that new fixmes appeared on the shader_runner when running some of his tests after f50d0ae2cbc5ee2a26fedd7b8aac2def62decd6c. vkd3d:652593:fixme:shader_sm4_read_src_param Unhandled mask 0x4. The change to blame seems to be this added line in sm4_src_from_constant_value(). + src->swizzle = VKD3D_SHADER_NO_SWIZZLE; On tpf binaries the last 12 bits of each src register in an instruction specify the swizzle, and there are 5 possible combinations: Dimension NONE -------- 00 Dimension SCALAR -------- 01 Dimension VEC4, with a 4 bit writemask: ---- xxxx 00 01 Dimension VEC4, with an 8 bit swizzle: xx xx xx xx 01 01 Dimension VEC4, with a 2bit scalar dimension number: ------ xx 10 01 So far, we have only seen src registers use 4 bit writemasks in a single case: for vec4 constants, and it is always zero. So we expect this: ---- 0000 00 01 Now, I probably wanted to initialize src->swizzle to zero when writing constants, but VKD3D_SHADER_NO_SWIZZLE is not zero, it is actually the default swizzle: 11 10 01 00 And the last 4 bits (0x4) get written in the mask part, which causes the reader to complain. --- libs/vkd3d-shader/tpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index afdf8473..8ae1657d 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3790,7 +3790,7 @@ static void sm4_dst_from_node(struct vkd3d_shader_dst_param *dst, const struct h static void sm4_src_from_constant_value(struct vkd3d_shader_src_param *src, const struct hlsl_constant_value *value, unsigned int width, unsigned int map_writemask) { - src->swizzle = VKD3D_SHADER_NO_SWIZZLE; + src->swizzle = 0; src->reg.type = VKD3DSPR_IMMCONST; if (width == 1) {

1 0

Zebediah Figura : vkd3d-shader/hlsl: Remove some tokens from the lexer.
by Alexandre Julliard 06 Nov '23

06 Nov '23

Module: vkd3d Branch: master Commit: 4cfc7d44ab6bf9f70d1c3c96caf700ebf057262b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4cfc7d44ab6bf9f70d1c3c96caf70… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jul 29 19:03:19 2023 -0500 vkd3d-shader/hlsl: Remove some tokens from the lexer. None of these currently have any meaning, and none of these can currently be parsed as distinct tokens either (i.e. they will generate a syntax error anyway). --- libs/vkd3d-shader/hlsl.l | 5 ----- libs/vkd3d-shader/hlsl.y | 5 ----- 2 files changed, 10 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index 83fe1d34..861ac173 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -166,7 +166,6 @@ while {return KW_WHILE; } \<\<= {return OP_LEFTSHIFTASSIGN; } \>\> {return OP_RIGHTSHIFT; } \>\>= {return OP_RIGHTSHIFTASSIGN; } -\.\.\. {return OP_ELLIPSIS; } \<= {return OP_LE; } \>= {return OP_GE; } != {return OP_NE; } @@ -178,10 +177,6 @@ while {return KW_WHILE; } &= {return OP_ANDASSIGN; } \|= {return OP_ORASSIGN; } ^= {return OP_XORASSIGN; } -## {return OP_UNKNOWN1; } -#@ {return OP_UNKNOWN2; } -:: {return OP_UNKNOWN3; } -\-\> {return OP_UNKNOWN4; } column_major {return KW_COLUMN_MAJOR; } row_major {return KW_ROW_MAJOR; } diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 3c30c0cb..0e72a539 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -4861,7 +4861,6 @@ static void check_duplicated_switch_cases(struct hlsl_ctx *ctx, const struct hls %token OP_LEFTSHIFTASSIGN %token OP_RIGHTSHIFT %token OP_RIGHTSHIFTASSIGN -%token OP_ELLIPSIS %token OP_LE %token OP_GE %token OP_NE @@ -4873,10 +4872,6 @@ static void check_duplicated_switch_cases(struct hlsl_ctx *ctx, const struct hls %token OP_ANDASSIGN %token OP_ORASSIGN %token OP_XORASSIGN -%token OP_UNKNOWN1 -%token OP_UNKNOWN2 -%token OP_UNKNOWN3 -%token OP_UNKNOWN4 %token <floatval> C_FLOAT

1 0

Zebediah Figura : vkd3d-shader/hlsl: Remove C++ comment lexing.
by Alexandre Julliard 06 Nov '23

06 Nov '23

Module: vkd3d Branch: master Commit: 7632365e6040bbb9ff45b7d4504f219ee4966ad8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7632365e6040bbb9ff45b7d4504f2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jul 29 19:05:45 2023 -0500 vkd3d-shader/hlsl: Remove C++ comment lexing. This is already handled by the preprocessor. --- libs/vkd3d-shader/hlsl.l | 3 --- 1 file changed, 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index 861ac173..5625891c 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -53,7 +53,6 @@ RESERVED4 typename|union|unsigned|using|virtual WS [ \t] NEWLINE (\n)|(\r\n) -DOUBLESLASHCOMMENT "//"[^\n]* STRING \"[^\"]*\" IDENTIFIER [A-Za-z_][A-Za-z0-9_]* @@ -218,8 +217,6 @@ row_major {return KW_ROW_MAJOR; } return C_INTEGER; } -{DOUBLESLASHCOMMENT} {} - {WS}+ {} {NEWLINE} { struct hlsl_ctx *ctx = yyget_extra(yyscanner);

1 0

Zebediah Figura : vkd3d-shader/hlsl: Sort keywords.
by Alexandre Julliard 06 Nov '23

06 Nov '23

Module: vkd3d Branch: master Commit: b9c164c1c4df13b9e8f6b728d36a6aaea72aa3c3 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b9c164c1c4df13b9e8f6b728d36a6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jul 29 19:08:48 2023 -0500 vkd3d-shader/hlsl: Sort keywords. Done with `LC_ALL=C sort -f`. --- libs/vkd3d-shader/hlsl.l | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index 5625891c..0e5f2bb6 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -75,6 +75,7 @@ Buffer {return KW_BUFFER; } case {return KW_CASE; } cbuffer {return KW_CBUFFER; } centroid {return KW_CENTROID; } +column_major {return KW_COLUMN_MAJOR; } compile {return KW_COMPILE; } const {return KW_CONST; } continue {return KW_CONTINUE; } @@ -104,9 +105,10 @@ pass {return KW_PASS; } PixelShader {return KW_PIXELSHADER; } precise {return KW_PRECISE; } RasterizerState {return KW_RASTERIZERSTATE; } +register {return KW_REGISTER; } RenderTargetView {return KW_RENDERTARGETVIEW; } return {return KW_RETURN; } -register {return KW_REGISTER; } +row_major {return KW_ROW_MAJOR; } RWBuffer {return KW_RWBUFFER; } RWStructuredBuffer {return KW_RWSTRUCTUREDBUFFER; } RWTexture1D {return KW_RWTEXTURE1D; } @@ -118,10 +120,10 @@ sampler {return KW_SAMPLER; } sampler1D {return KW_SAMPLER1D; } sampler2D {return KW_SAMPLER2D; } sampler3D {return KW_SAMPLER3D; } -samplerCUBE {return KW_SAMPLERCUBE; } -sampler_state {return KW_SAMPLER_STATE; } SamplerComparisonState {return KW_SAMPLERCOMPARISONSTATE;} +samplerCUBE {return KW_SAMPLERCUBE; } SamplerState {return KW_SAMPLER; } +sampler_state {return KW_SAMPLER_STATE; } shared {return KW_SHARED; } stateblock {return KW_STATEBLOCK; } stateblock_state {return KW_STATEBLOCK_STATE; } @@ -134,18 +136,18 @@ tbuffer {return KW_TBUFFER; } technique10 {return KW_TECHNIQUE10; } technique11 {return KW_TECHNIQUE11; } texture {return KW_TEXTURE; } -texture1D {return KW_TEXTURE1D; } Texture1D {return KW_TEXTURE1D; } +texture1D {return KW_TEXTURE1D; } Texture1DArray {return KW_TEXTURE1DARRAY; } -texture2D {return KW_TEXTURE2D; } Texture2D {return KW_TEXTURE2D; } +texture2D {return KW_TEXTURE2D; } Texture2DArray {return KW_TEXTURE2DARRAY; } Texture2DMS {return KW_TEXTURE2DMS; } Texture2DMSArray {return KW_TEXTURE2DMSARRAY; } -texture3D {return KW_TEXTURE3D; } Texture3D {return KW_TEXTURE3D; } -textureCUBE {return KW_TEXTURECUBE; } +texture3D {return KW_TEXTURE3D; } TextureCube {return KW_TEXTURECUBE; } +textureCUBE {return KW_TEXTURECUBE; } TextureCubeArray {return KW_TEXTURECUBEARRAY; } true {return KW_TRUE; } typedef {return KW_TYPEDEF; } @@ -177,9 +179,6 @@ while {return KW_WHILE; } \|= {return OP_ORASSIGN; } ^= {return OP_XORASSIGN; } -column_major {return KW_COLUMN_MAJOR; } -row_major {return KW_ROW_MAJOR; } - {IDENTIFIER} { struct hlsl_ctx *ctx = yyget_extra(yyscanner);

1 0

Zebediah Figura : vkd3d-shader/hlsl: Consistently use HLSL allocation functions.
by Alexandre Julliard 06 Nov '23

06 Nov '23

Module: vkd3d Branch: master Commit: a9f33e86579f62cd6ec789e92d45fa526e881204 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a9f33e86579f62cd6ec789e92d45f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 1 15:36:24 2023 -0500 vkd3d-shader/hlsl: Consistently use HLSL allocation functions. --- libs/vkd3d-shader/hlsl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index c8677f41..1d3fd0f7 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -759,7 +759,7 @@ struct hlsl_type *hlsl_new_uav_type(struct hlsl_ctx *ctx, enum hlsl_sampler_dim { struct hlsl_type *type; - if (!(type = vkd3d_calloc(1, sizeof(*type)))) + if (!(type = hlsl_alloc(ctx, sizeof(*type)))) return NULL; type->class = HLSL_CLASS_OBJECT; type->base_type = HLSL_TYPE_UAV; @@ -1617,7 +1617,7 @@ static bool clone_block(struct hlsl_ctx *ctx, struct hlsl_block *dst_block, if (!list_empty(&src->uses)) { - if (!vkd3d_array_reserve((void **)&map->instrs, &map->capacity, map->count + 1, sizeof(*map->instrs))) + if (!hlsl_array_reserve(ctx, (void **)&map->instrs, &map->capacity, map->count + 1, sizeof(*map->instrs))) { hlsl_block_cleanup(dst_block); return false;

1 0

Henri Verbeet : vkd3d-shader/tpf: Do not write RDEF constant buffer entries for HLSL_CLASS_OBJECT variables.
by Alexandre Julliard 06 Nov '23

06 Nov '23

Module: vkd3d Branch: master Commit: aa5380f32a89e5dd849c4b06ec99b36ab9f87cd5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/aa5380f32a89e5dd849c4b06ec99b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 6 20:03:21 2023 +0100 vkd3d-shader/tpf: Do not write RDEF constant buffer entries for HLSL_CLASS_OBJECT variables. RWBuffer objects would trigger a vkd3d_unreachable() in sm4_base_type(). It would be easy enough to add the required case there, but (manual, unfortunately) tests show that we aren't supposed to write constant buffer entries for objects in the first place, as you'd expect. This particular path ends up being exercised by vkd3d's internal UAV clear shaders, but unfortunately it looks like our RDEF data may have more issues; the ability to write tests for it would seem helpful. --- libs/vkd3d-shader/tpf.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 8ae1657d..fbc04f61 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3460,7 +3460,8 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { - if (var->is_uniform && var->buffer == cbuffer) + if (var->is_uniform && var->buffer == cbuffer + && var->data_type->class != HLSL_CLASS_OBJECT) ++var_count; } @@ -3494,7 +3495,8 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { - if (var->is_uniform && var->buffer == cbuffer) + if (var->is_uniform && var->buffer == cbuffer + && var->data_type->class != HLSL_CLASS_OBJECT) { uint32_t flags = 0; @@ -3521,7 +3523,8 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) j = 0; LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { - if (var->is_uniform && var->buffer == cbuffer) + if (var->is_uniform && var->buffer == cbuffer + && var->data_type->class != HLSL_CLASS_OBJECT) { const unsigned int var_size = (profile->major_version >= 5 ? 10 : 6); size_t var_offset = vars_start + j * var_size * sizeof(uint32_t);

1 0

Henri Verbeet : vkd3d: Compile the UAV clear shaders at runtime.
by Alexandre Julliard 06 Nov '23

06 Nov '23

Module: vkd3d Branch: master Commit: a03e78bf6285d4344f5d7774729b4b64175422a7 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a03e78bf6285d4344f5d7774729b4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 6 01:53:49 2023 +0200 vkd3d: Compile the UAV clear shaders at runtime. --- libs/vkd3d/state.c | 48 +++- libs/vkd3d/vkd3d_shaders.h | 568 ++++++++++++++++----------------------------- 2 files changed, 248 insertions(+), 368 deletions(-)

1 0

Jacek Caban : gdiplus/tests: Avoid implicit casts from MetafileType to EmfType.
by Alexandre Julliard 06 Nov '23

06 Nov '23

Module: wine Branch: master Commit: a6da51347e8a1bfed073f71c65dfc048ea85d3a9 URL: https://gitlab.winehq.org/wine/wine/-/commit/a6da51347e8a1bfed073f71c65dfc0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 24 19:42:09 2023 +0200 gdiplus/tests: Avoid implicit casts from MetafileType to EmfType. --- dlls/gdiplus/tests/metafile.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index f3ab27c0bd2..eda5760c0fa 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -392,16 +392,16 @@ static void test_empty(void) stat = GdipRecordMetafile(NULL, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel, description, &metafile); expect(InvalidParameter, stat); - stat = GdipRecordMetafile(hdc, MetafileTypeInvalid, &frame, MetafileFrameUnitPixel, description, &metafile); + stat = GdipRecordMetafile(hdc, (EmfType)MetafileTypeInvalid, &frame, MetafileFrameUnitPixel, description, &metafile); expect(InvalidParameter, stat); - stat = GdipRecordMetafile(hdc, MetafileTypeWmf, &frame, MetafileFrameUnitPixel, description, &metafile); + stat = GdipRecordMetafile(hdc, (EmfType)MetafileTypeWmf, &frame, MetafileFrameUnitPixel, description, &metafile); expect(InvalidParameter, stat); - stat = GdipRecordMetafile(hdc, MetafileTypeWmfPlaceable, &frame, MetafileFrameUnitPixel, description, &metafile); + stat = GdipRecordMetafile(hdc, (EmfType)MetafileTypeWmfPlaceable, &frame, MetafileFrameUnitPixel, description, &metafile); expect(InvalidParameter, stat); - stat = GdipRecordMetafile(hdc, MetafileTypeEmfPlusDual+1, &frame, MetafileFrameUnitPixel, description, &metafile); + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusDual+1, &frame, MetafileFrameUnitPixel, description, &metafile); expect(InvalidParameter, stat); stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel, description, NULL); @@ -1937,7 +1937,7 @@ static void test_converttoemfplus(void) hdc = CreateCompatibleDC(0); - stat = GdipRecordMetafile(hdc, MetafileTypeEmf, &frame, MetafileFrameUnitPixel, description, &metafile); + stat = GdipRecordMetafile(hdc, EmfTypeEmfOnly, &frame, MetafileFrameUnitPixel, description, &metafile); expect(Ok, stat); stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel, description, &emhmeta); @@ -1961,10 +1961,10 @@ static void test_converttoemfplus(void) stat = pGdipConvertToEmfPlus(graphics, metafile, &succ, EmfTypeEmfPlusOnly, description, NULL); expect(InvalidParameter, stat); - stat = pGdipConvertToEmfPlus(graphics, metafile, NULL, MetafileTypeInvalid, NULL, &metafile2); + stat = pGdipConvertToEmfPlus(graphics, metafile, NULL, 0, NULL, &metafile2); expect(InvalidParameter, stat); - stat = pGdipConvertToEmfPlus(graphics, metafile, NULL, MetafileTypeEmfPlusDual+1, NULL, &metafile2); + stat = pGdipConvertToEmfPlus(graphics, metafile, NULL, EmfTypeEmfPlusDual+1, NULL, &metafile2); expect(InvalidParameter, stat); /* If we are already an Enhanced Metafile then the conversion fails. */

1 0