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

Jacek Caban : mshtml/tests: Add more custom properties tests.
by Alexandre Julliard 31 May '24

31 May '24

Module: wine Branch: master Commit: 984178cdb0ad9275520f21ead1756d98fc69ec04 URL: https://gitlab.winehq.org/wine/wine/-/commit/984178cdb0ad9275520f21ead1756d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 29 22:41:22 2024 +0200 mshtml/tests: Add more custom properties tests. --- dlls/mshtml/tests/documentmode.js | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 5249e042182..2eed3bb1aff 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -950,6 +950,30 @@ sync_test("elem_by_id", function() { ok(v < 9 && e.number === 0xa01b6 - 0x80000000, "Setting document.testid threw = " + e.number); } + window.testid2 = 1; + document.testid2 = 2; + document.body.innerHTML = '<form id="testid2" name="testname"></form>'; + ok(window.testid2 == 1, "window.testid2 = " + window.testid2); + id_elem = document.body.firstChild; + todo_wine_if(v < 9). + ok(document.testid2 == (v < 9 ? id_elem : 2), "document.testid2 = " + document.testid2); + document.body.innerHTML = ''; + ok(window.testid2 == 1, "window.testid2 = " + window.testid2); + ok(document.testid2 == 2, "document.testid2 = " + document.testid2 + " expected 2"); + + ok(document.title === "", "document.title = " + document.title); + document.body.innerHTML = '<form id="title" name="testname"></form>'; + id_elem = document.body.firstChild; + todo_wine_if(v < 9). + ok(document.title === (v < 9 ? id_elem : ""), "document.title = " + document.title); + document.body.innerHTML = ''; + ok(document.title === "", "document.title = " + document.title); + + ok(window.closed === false, "window.closed = " + window.closed); + document.body.innerHTML = '<form id="closed" name="testname"></form>'; + id_elem = document.body.firstChild; + ok(window.closed === false, "window.closed = " + window.closed); + // these tags expose name as props, and id only if they have a name var tags = [ "embed", "form", "iframe", "img" ]; for(i in tags) { @@ -3011,3 +3035,17 @@ async_test("postMessage", function() { ok(onmessage_called == (v < 9 ? true : false), "onmessage not called"); if(v < 9) next_test(); }); + +sync_test("form", function() { + document.body.innerHTML = ""; + var form = document.createElement("form"); + document.body.appendChild(form); + + form[0] = "test"; + form.innerHTML = "<input type=\"text\" id = \"i1\" /><input type=\"text\" id = \"i2\" />"; + ok(form.length === 2, "form.length = " + form.length); + ok(typeof(form[0]) === "object", "form[0] = " + form[0]); + ok(typeof(form[1]) === "object", "form[1] = " + form[1]); + form.innerHTML = ""; + ok(form[0] === "test", "form[0] = " + form[0]); +});

1 0

Francis De Brabandere : vbscript/tests: Fix error clear call.
by Alexandre Julliard 31 May '24

31 May '24

Module: wine Branch: master Commit: 1c88cb4e4ea8ffc0f7895d1f6525817896d336fd URL: https://gitlab.winehq.org/wine/wine/-/commit/1c88cb4e4ea8ffc0f7895d1f652581… Author: Francis De Brabandere <francisdb(a)gmail.com> Date: Fri May 24 13:22:42 2024 +0000 vbscript/tests: Fix error clear call. --- dlls/vbscript/tests/api.vbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 3974781d6a8..7b8744f4c74 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -131,7 +131,7 @@ if isEnglishLang then TestCStr true, "True" sub testCStrError() on error resume next - Error.clear() + Err.clear() CStr(null) call ok(Err.number = 94, "Err.number = " & Err.number) if isEnglishLang then call ok(Err.source = "Microsoft VBScript runtime error", "Err.source = " & Err.source)

1 0

Nikolay Sivov : tests: Add some basic tests for ConstantBuffer type.
by Alexandre Julliard 30 May '24

30 May '24

Module: vkd3d Branch: master Commit: 163aaf9729787bbcc1f348b11f12e8e8803c6a32 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/163aaf9729787bbcc1f348b11f12e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 24 09:43:39 2024 +0200 tests: Add some basic tests for ConstantBuffer type. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- tests/hlsl/cbuffer.shader_test | 89 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/tests/hlsl/cbuffer.shader_test b/tests/hlsl/cbuffer.shader_test index 1297b72b..733322ce 100644 --- a/tests/hlsl/cbuffer.shader_test +++ b/tests/hlsl/cbuffer.shader_test @@ -860,3 +860,92 @@ uniform 12 float4 12.0 13.0 14.0 15.0 uniform 16 float4 16.0 17.0 18.0 19.0 todo(glsl) draw quad probe all rgba (124.0, 135.0, 146.0, 150.5) + +[require] +shader model >= 5.1 + +[pixel shader fail todo] +float4 ConstantBuffer; + +float4 main() : sv_target +{ + return ConstantBuffer; +} + +[pixel shader fail] +struct s +{ + float4 m; +}; + +float4 cb; +ConstantBuffer<s> cb; + +float4 main() : sv_target +{ + return 0; +} + +[pixel shader fail(sm>=6) todo] +struct s +{ + float4 m; +}; + +float4 main() : sv_target +{ + // Local variable do not create resource definitions, + // acting like a constant + ConstantBuffer<s> cb = (s)1; + float4 var = 0.1f; + var += cb.m; + return var; +} + +[test] +todo draw quad +probe all rgba (1.1, 1.1, 1.1, 1.1) + +[pixel shader fail] +struct s +{ + float4 m; +}; + +float4 main() : sv_target +{ + ConstantBuffer<s> cb = (s)0; + cb.m = 1.0f; + return cb.m; +} + +[pixel shader todo] +struct s +{ + float4 m; +}; + +float4 var; + +ConstantBuffer<s> cb[2][3] : register(b1); +cbuffer cb +{ + float4 m2; +}; + +float4 main() : sv_target +{ + return 0; +} + +[require] +shader model >= 2.0 +shader model < 5.1 + +[pixel shader] +float4 ConstantBuffer; + +float4 main() : sv_target +{ + return ConstantBuffer; +}

1 0

Nikolay Sivov : tests: Add a few tests for the NULL value.
by Alexandre Julliard 30 May '24

30 May '24

Module: vkd3d Branch: master Commit: 727aacca189c07e9d5ff0793cb1dec70ede5a45b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/727aacca189c07e9d5ff0793cb1de… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 28 14:43:36 2024 +0200 tests: Add a few tests for the NULL value. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Makefile.am | 1 + tests/hlsl/null.shader_test | 81 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+) diff --git a/Makefile.am b/Makefile.am index 619bcdf4..46772fd9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -162,6 +162,7 @@ vkd3d_shader_tests = \ tests/hlsl/nointerpolation.shader_test \ tests/hlsl/non-const-indexing.shader_test \ tests/hlsl/normalize.shader_test \ + tests/hlsl/null.shader_test \ tests/hlsl/numeric-constructor-truncation.shader_test \ tests/hlsl/numeric-types.shader_test \ tests/hlsl/numthreads.shader_test \ diff --git a/tests/hlsl/null.shader_test b/tests/hlsl/null.shader_test new file mode 100644 index 00000000..bf0a0ce5 --- /dev/null +++ b/tests/hlsl/null.shader_test @@ -0,0 +1,81 @@ +[pixel shader fail] +float4 var = NULL; + +float4 main() : sv_target +{ + return 0; +} + +[pixel shader fail] +float4x4 var = NULL; + +float4 main() : sv_target +{ + return 0; +} + +[pixel shader fail] +struct s +{ + float4 f; +}; + +float4 main() : sv_target +{ + s var = (s)NULL; + return s.f; +} + +[pixel shader fail(sm<6)] +Texture var = null; + +float4 main() : sv_target +{ + return 0; +} + +[pixel shader todo] +SamplerState s +{ + UnknownField = NULL; +}; + +Texture t = NULL; +PixelShader ps = NULL; +VertexShader vs = NULL; + +float4 main() : sv_target +{ + return 0; +} + +[require] +shader model >= 4.0 + +[pixel shader fail(sm>=6) todo] +Texture2DMS<float4> t = NULL; + +RWTexture1D<float4> u1 = NULL; +RWTexture2D<float4> u2 = NULL; +RWTexture3D<float4> u3 = NULL; + +RWTexture1DArray<float4> ua1 = NULL; +RWTexture2DArray<float4> ua2 = NULL; + +RWBuffer<float4> b1 = NULL; + +float4 main() : sv_target +{ + return 0; +} + +[require] +shader model >= 5.0 + +[pixel shader fail(sm>=6) todo] +RasterizerOrderedTexture2D<uint4> t1 = NULL; + +float4 main() : sv_target +{ + return 0; +}

1 0

Nikolay Sivov : vkd3d-shader/fx: Do not write shared buffers block when not compiling as a child effect.
by Alexandre Julliard 30 May '24

30 May '24

Module: vkd3d Branch: master Commit: 5265fbb789703b79ef83a32ed625b9b9fa118331 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5265fbb789703b79ef83a32ed625b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 30 13:59:36 2024 +0200 vkd3d-shader/fx: Do not write shared buffers block when not compiling as a child effect. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/fx.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index 57b4ac24..d8653dbf 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -1464,6 +1464,9 @@ static void write_buffers(struct fx_write_context *fx, bool shared) { struct hlsl_buffer *buffer; + if (shared && !fx->child_effect) + return; + LIST_FOR_EACH_ENTRY(buffer, &fx->ctx->buffers, struct hlsl_buffer, entry) { if (!buffer->size && !fx->include_empty_buffers)

1 0

Henri Verbeet : vkd3d-shader/ir: Rename the "handler_idx" field of struct vkd3d_shader_instruction to "opcode".
by Alexandre Julliard 30 May '24

30 May '24

Module: vkd3d Branch: master Commit: 1fe7a6581b305af724e70868472d5880ec52f9d2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1fe7a6581b305af724e70868472d5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 24 20:34:42 2024 +0200 vkd3d-shader/ir: Rename the "handler_idx" field of struct vkd3d_shader_instruction to "opcode". --- libs/vkd3d-shader/d3d_asm.c | 12 +-- libs/vkd3d-shader/d3dbc.c | 14 +-- libs/vkd3d-shader/dxil.c | 45 +++++----- libs/vkd3d-shader/glsl.c | 6 +- libs/vkd3d-shader/ir.c | 144 +++++++++++++++--------------- libs/vkd3d-shader/spirv.c | 146 +++++++++++++++---------------- libs/vkd3d-shader/tpf.c | 28 +++--- libs/vkd3d-shader/vkd3d_shader_main.c | 28 +++--- libs/vkd3d-shader/vkd3d_shader_private.h | 6 +- 9 files changed, 215 insertions(+), 214 deletions(-)

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Handle "unsigned int" type.
by Alexandre Julliard 30 May '24

30 May '24

Module: vkd3d Branch: master Commit: ea177a7750401c898699c5e3ab50f991195c550d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ea177a7750401c898699c5e3ab50f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 18 23:29:58 2024 +0200 vkd3d-shader/hlsl: Handle "unsigned int" type. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Makefile.am | 1 + libs/vkd3d-shader/hlsl.l | 3 +- libs/vkd3d-shader/hlsl.y | 21 +++++++++++++ tests/hlsl/unsigned.shader_test | 66 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 90 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 7936b988..619bcdf4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -234,6 +234,7 @@ vkd3d_shader_tests = \ tests/hlsl/uav-rwstructuredbuffer.shader_test \ tests/hlsl/uav-rwtexture.shader_test \ tests/hlsl/unbounded-array-5.1.shader_test \ + tests/hlsl/unsigned.shader_test \ tests/hlsl/uniform-parameters.shader_test \ tests/hlsl/uniform-semantics.shader_test \ tests/hlsl/vector-indexing-uniform.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index a5923d8b..91418775 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -49,7 +49,7 @@ static void update_location(struct hlsl_ctx *ctx, YYLTYPE *loc); RESERVED1 auto|catch|char|class|const_cast|delete|dynamic_cast|enum RESERVED2 explicit|friend|goto|long|mutable|new|operator|private|protected|public RESERVED3 reinterpret_cast|short|signed|sizeof|static_cast|template|this|throw|try -RESERVED4 typename|union|unsigned|using|virtual +RESERVED4 typename|union|using|virtual WS [ \t] NEWLINE (\n)|(\r\n) @@ -164,6 +164,7 @@ textureCUBE {return KW_TEXTURECUBE; } TextureCubeArray {return KW_TEXTURECUBEARRAY; } true {return KW_TRUE; } typedef {return KW_TYPEDEF; } +unsigned {return KW_UNSIGNED; } uniform {return KW_UNIFORM; } vector {return KW_VECTOR; } VertexShader {return KW_VERTEXSHADER; } diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 9c1bdef9..0b742f12 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -5566,6 +5566,7 @@ static bool state_block_add_entry(struct hlsl_state_block *state_block, struct h %token KW_TEXTURECUBEARRAY %token KW_TRUE %token KW_TYPEDEF +%token KW_UNSIGNED %token KW_UNIFORM %token KW_VECTOR %token KW_VERTEXSHADER @@ -6713,6 +6714,26 @@ type_no_void: } vkd3d_free($1); } + | KW_UNSIGNED TYPE_IDENTIFIER + { + struct hlsl_type *type = hlsl_get_type(ctx->cur_scope, $2, true, true); + + if (hlsl_is_numeric_type(type) && type->e.numeric.type == HLSL_TYPE_INT) + { + if (!(type = hlsl_type_clone(ctx, type, 0, 0))) + YYABORT; + vkd3d_free((void *)type->name); + type->name = NULL; + type->e.numeric.type = HLSL_TYPE_UINT; + } + else + { + hlsl_error(ctx, &@2, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "The 'unsigned' keyword can't be used with type %s.", $2); + } + + $$ = type; + } | KW_STRUCT TYPE_IDENTIFIER { $$ = hlsl_get_type(ctx->cur_scope, $2, true, true); diff --git a/tests/hlsl/unsigned.shader_test b/tests/hlsl/unsigned.shader_test new file mode 100644 index 00000000..8f7aa3dc --- /dev/null +++ b/tests/hlsl/unsigned.shader_test @@ -0,0 +1,66 @@ +[pixel shader] +unsigned int var1; +unsigned int2x2 var2; +unsigned int2 var3; +unsigned int var4[2]; + +typedef int Int; +typedef int2x2 Int2x2; +typedef int2 Int2; + +unsigned Int var5; +unsigned Int2x2 var6; +unsigned Int2 var7; + +float4 main() : sv_target +{ + return 0; +} + +[pixel shader fail(sm<6)] +unsigned uint var; + +float4 main() : sv_target +{ + return 0; +} + +[pixel shader fail(sm<6)] +unsigned uint2 var; + +float4 main() : sv_target +{ + return 0; +} + +[pixel shader fail(sm<6)] +unsigned uint2x2 var; + +float4 main() : sv_target +{ + return 0; +} + +[require] +shader model >= 4.0 + +[pixel shader] +Texture2D<unsigned int> t; + +float4 main() : sv_target +{ + return 0; +} + +[require] +shader model < 6.0 + +[pixel shader fail] +// crashes with dxc +typedef int Int[2]; +unsigned Int var; + +float4 main() : sv_target +{ + return 0; +}

1 0

Alexandre Julliard : vkd3d: Import upstream release 1.12.
by Alexandre Julliard 30 May '24

30 May '24

Module: wine Branch: master Commit: fecd22d2aef0afb0436ed53b75f32cb9329af1d3 URL: https://gitlab.winehq.org/wine/wine/-/commit/fecd22d2aef0afb0436ed53b75f32c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 29 22:54:58 2024 +0200 vkd3d: Import upstream release 1.12. --- dlls/d3d10/tests/effect.c | 1 - dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 6 +- libs/vkd3d/AUTHORS | 2 +- libs/vkd3d/Makefile.in | 1 + libs/vkd3d/config.h | 4 +- libs/vkd3d/include/private/vkd3d_common.h | 322 ++ libs/vkd3d/include/private/vkd3d_memory.h | 11 +- libs/vkd3d/include/vkd3d.h | 207 +- libs/vkd3d/include/vkd3d_shader.h | 76 +- libs/vkd3d/include/vkd3d_types.h | 8 + libs/vkd3d/libs/vkd3d-common/blob.c | 5 +- libs/vkd3d/libs/vkd3d-common/debug.c | 2 +- libs/vkd3d/libs/vkd3d-common/error.c | 7 +- libs/vkd3d/libs/vkd3d-shader/d3d_asm.c | 1190 ++++--- libs/vkd3d/libs/vkd3d-shader/d3dbc.c | 360 ++- libs/vkd3d/libs/vkd3d-shader/dxbc.c | 49 +- libs/vkd3d/libs/vkd3d-shader/dxil.c | 2633 +++++++++++++-- libs/vkd3d/libs/vkd3d-shader/fx.c | 994 +++++- libs/vkd3d/libs/vkd3d-shader/glsl.c | 109 +- libs/vkd3d/libs/vkd3d-shader/hlsl.c | 723 +++-- libs/vkd3d/libs/vkd3d-shader/hlsl.h | 162 +- libs/vkd3d/libs/vkd3d-shader/hlsl.l | 9 +- libs/vkd3d/libs/vkd3d-shader/hlsl.y | 904 ++++-- libs/vkd3d/libs/vkd3d-shader/hlsl_codegen.c | 863 +++-- libs/vkd3d/libs/vkd3d-shader/hlsl_constant_ops.c | 317 +- libs/vkd3d/libs/vkd3d-shader/ir.c | 3362 ++++++++++++++++---- libs/vkd3d/libs/vkd3d-shader/preproc.l | 3 +- libs/vkd3d/libs/vkd3d-shader/spirv.c | 729 ++++- libs/vkd3d/libs/vkd3d-shader/tpf.c | 421 ++- libs/vkd3d/libs/vkd3d-shader/vkd3d_shader_main.c | 340 +- .../vkd3d/libs/vkd3d-shader/vkd3d_shader_private.h | 192 +- libs/vkd3d/libs/vkd3d/cache.c | 254 ++ libs/vkd3d/libs/vkd3d/command.c | 41 +- libs/vkd3d/libs/vkd3d/device.c | 1060 ++++-- libs/vkd3d/libs/vkd3d/resource.c | 51 +- libs/vkd3d/libs/vkd3d/state.c | 42 +- libs/vkd3d/libs/vkd3d/utils.c | 34 + libs/vkd3d/libs/vkd3d/vkd3d_main.c | 22 +- libs/vkd3d/libs/vkd3d/vkd3d_private.h | 268 +- 39 files changed, 12173 insertions(+), 3611 deletions(-)

1 0

Elizabeth Figura : wined3d: Remove the no longer used WINED3D_SHADER_CAP_SRGB_WRITE flag.
by Alexandre Julliard 30 May '24

30 May '24

Module: wine Branch: master Commit: 9c895e2f047addefed78bc05c2d1693cfa0a33f6 URL: https://gitlab.winehq.org/wine/wine/-/commit/9c895e2f047addefed78bc05c2d169… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Tue Apr 23 16:15:06 2024 -0500 wined3d: Remove the no longer used WINED3D_SHADER_CAP_SRGB_WRITE flag. --- dlls/wined3d/glsl_shader.c | 1 - dlls/wined3d/shader_spirv.c | 3 +-- dlls/wined3d/utils.c | 19 +++++-------------- dlls/wined3d/wined3d_private.h | 1 - 4 files changed, 6 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 13ba1d65d13..ba61fe5a3cd 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -11368,7 +11368,6 @@ static void shader_glsl_get_caps(const struct wined3d_adapter *adapter, struct s /* Ideally we'd only set caps like sRGB writes here if supported by both * the shader backend and the fragment pipe, but we can get called before * shader_glsl_alloc(). */ - caps->wined3d_caps = WINED3D_SHADER_CAP_SRGB_WRITE; if (needs_interpolation_qualifiers_for_shader_outputs(gl_info)) caps->wined3d_caps |= WINED3D_SHADER_CAP_OUTPUT_INTERPOLATION; if (shader_glsl_full_ffp_varyings(gl_info)) diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index 37fc1cb22d1..110fdfeff39 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -1076,8 +1076,7 @@ static void shader_spirv_get_caps(const struct wined3d_adapter *adapter, struct caps->ps_uniform_count = WINED3D_MAX_PS_CONSTS_F; caps->ps_1x_max_value = FLT_MAX; caps->varying_count = 0; - caps->wined3d_caps = WINED3D_SHADER_CAP_SRGB_WRITE - | WINED3D_SHADER_CAP_FULL_FFP_VARYINGS; + caps->wined3d_caps = WINED3D_SHADER_CAP_FULL_FFP_VARYINGS; } static BOOL shader_spirv_color_fixup_supported(struct color_fixup_desc fixup) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index ef95c40135a..e4ff36425ab 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3059,7 +3059,7 @@ static void query_view_class(struct wined3d_format_gl *format) static void query_internal_format(struct wined3d_adapter *adapter, struct wined3d_format_gl *format, const struct wined3d_format_texture_info *texture_info, - struct wined3d_gl_info *gl_info, BOOL srgb_write_supported, BOOL srgb_format) + struct wined3d_gl_info *gl_info, BOOL srgb_format) { GLint count, multisample_types[8]; unsigned int i, max_log2; @@ -3078,12 +3078,8 @@ static void query_internal_format(struct wined3d_adapter *adapter, { query_format_cap(gl_info, format, format->srgb_internal, GL_SRGB_READ, WINED3D_FORMAT_CAP_SRGB_READ, "sRGB read"); - - if (srgb_write_supported) - query_format_cap(gl_info, format, format->srgb_internal, GL_SRGB_WRITE, - WINED3D_FORMAT_CAP_SRGB_WRITE, "sRGB write"); - else - format_clear_caps(&format->f, WINED3D_FORMAT_CAP_SRGB_WRITE); + query_format_cap(gl_info, format, format->srgb_internal, GL_SRGB_WRITE, + WINED3D_FORMAT_CAP_SRGB_WRITE, "sRGB write"); if (!(format->f.caps[WINED3D_GL_RES_TYPE_TEX_2D] & (WINED3D_FORMAT_CAP_SRGB_READ | WINED3D_FORMAT_CAP_SRGB_WRITE))) @@ -3115,9 +3111,6 @@ static void query_internal_format(struct wined3d_adapter *adapter, format->internal = format->srgb_internal; } } - - if ((format->f.caps[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3D_FORMAT_CAP_SRGB_WRITE) && !srgb_write_supported) - format_clear_caps(&format->f, WINED3D_FORMAT_CAP_SRGB_WRITE); } if (!gl_info->supported[ARB_DEPTH_TEXTURE] && (format->f.depth_size || format->f.stencil_size)) @@ -3170,11 +3163,9 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win struct fragment_caps fragment_caps; struct shader_caps shader_caps; unsigned int i, j; - BOOL srgb_write; adapter->fragment_pipe->get_caps(adapter, &fragment_caps); adapter->shader_backend->shader_get_caps(adapter, &shader_caps); - srgb_write = (!shader_caps.ps_version || (shader_caps.wined3d_caps & WINED3D_SHADER_CAP_SRGB_WRITE)); for (i = 0; i < ARRAY_SIZE(format_texture_info); ++i) { @@ -3229,7 +3220,7 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win if (!gl_info->supported[ARB_SHADOW] && (format->f.caps[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3D_FORMAT_CAP_SHADOW)) format_clear_caps(&format->f, WINED3D_FORMAT_CAP_TEXTURE); - query_internal_format(adapter, format, &format_texture_info[i], gl_info, srgb_write, FALSE); + query_internal_format(adapter, format, &format_texture_info[i], gl_info, FALSE); /* Texture conversion stuff */ format->f.conv_byte_count = format_texture_info[i].conv_byte_count; @@ -3257,7 +3248,7 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win srgb_format->internal = format_texture_info[i].gl_srgb_internal; srgb_format->srgb_internal = format_texture_info[i].gl_srgb_internal; format_set_caps(&srgb_format->f, WINED3D_FORMAT_CAP_SRGB_READ | WINED3D_FORMAT_CAP_SRGB_WRITE); - query_internal_format(adapter, srgb_format, &format_texture_info[i], gl_info, srgb_write, TRUE); + query_internal_format(adapter, srgb_format, &format_texture_info[i], gl_info, TRUE); } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2d1bab87b00..ea45e5ebdb3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1401,7 +1401,6 @@ BOOL shader_get_stream_output_register_info(const struct wined3d_shader *shader, typedef void (*SHADER_HANDLER)(const struct wined3d_shader_instruction *); -#define WINED3D_SHADER_CAP_SRGB_WRITE 0x00000002u #define WINED3D_SHADER_CAP_DOUBLE_PRECISION 0x00000004u #define WINED3D_SHADER_CAP_OUTPUT_INTERPOLATION 0x00000008u #define WINED3D_SHADER_CAP_FULL_FFP_VARYINGS 0x00000010u

1 0

Elizabeth Figura : wined3d: Move the GL_EXTCALL() definition to wined3d_gl.h.
by Alexandre Julliard 30 May '24

30 May '24

Module: wine Branch: master Commit: 7cc688371ff9b22ba0ed972836781fcf8c90cda3 URL: https://gitlab.winehq.org/wine/wine/-/commit/7cc688371ff9b22ba0ed972836781f… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Tue Apr 23 16:29:28 2024 -0500 wined3d: Move the GL_EXTCALL() definition to wined3d_gl.h. --- dlls/wined3d/wined3d_gl.h | 2 ++ dlls/wined3d/wined3d_private.h | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 060d92318f8..561de235379 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -358,6 +358,8 @@ struct wined3d_gl_info void (WINE_GLAPI *p_glEnableWINE)(GLenum cap); }; +#define GL_EXTCALL(f) (gl_info->gl_ops.ext.p_##f) + void install_gl_compat_wrapper(struct wined3d_gl_info *gl_info, enum wined3d_gl_extension ext); void print_glsl_info_log(const struct wined3d_gl_info *gl_info, GLuint id, BOOL program); void shader_glsl_validate_link(const struct wined3d_gl_info *gl_info, GLuint program); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ea45e5ebdb3..8b8d9457a38 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1553,8 +1553,6 @@ extern const struct wined3d_shader_backend_ops none_shader_backend; const struct wined3d_shader_backend_ops *wined3d_spirv_shader_backend_init_vk(void); -#define GL_EXTCALL(f) (gl_info->gl_ops.ext.p_##f) - #define D3DCOLOR_B_R(dw) (((dw) >> 16) & 0xff) #define D3DCOLOR_B_G(dw) (((dw) >> 8) & 0xff) #define D3DCOLOR_B_B(dw) (((dw) >> 0) & 0xff)

1 0