- Wine-GitLab - list.winehq.org

[PATCH v4 0/7] MR181: vkd3d-shader: Normalise signatures and input/output registers to the Shader Model 6 pattern.
by Conor McCarthy (＠cmccarthy) April 28, 2023

April 28, 2023

-- v4: vkd3d-shader: Add source information to normaliser errors and warnings. https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/181

2 8

[PATCH v3 0/6] MR181: vkd3d-shader: Normalise signatures and input/output registers to the Shader Model 6 pattern.
by Conor McCarthy (＠cmccarthy) April 28, 2023

April 28, 2023

-- v3: vkd3d-shader/ir: Normalise signatures and input/output registers to the Shader Model 6 pattern. vkd3d-shader/tpf: Fail parsing if an input/output parameter order is > 2. tests/d3d12: Test register relative addressing in vertex and pixel shaders. vkd3d-shader: Introduce an internal sm6 signature structure. vkd3d-shader/tpf: Return an error from vkd3d_shader_sm4_parser_create() if the parser failed. vkd3d-shader/d3dbc: Return an error from vkd3d_shader_sm1_parser_create() if the parser failed. https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/181

2 6

[PATCH v3 0/1] MR180: vkd3d-shader/hlsl: Partially implement static expressions evaluation.
by Nikolay Sivov (＠nsivov) April 28, 2023

April 28, 2023

-- v3: vkd3d-shader/hlsl: Partially implement static expressions evaluation. https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/180

4 3

[PATCH v2 0/4] MR181: vkd3d-shader: Normalise signatures and input/output registers to the Shader Model 6 pattern.
by Conor McCarthy (＠cmccarthy) April 28, 2023

April 28, 2023

-- v2: vkd3d-shader/ir: Normalise signatures and input/output registers to the Shader Model 6 pattern. vkd3d-shader/tpf: Fail parsing if an input/output parameter order is > 2. tests/d3d12: Test register relative addressing in vertex and pixel shaders. vkd3d-shader: Introduce an internal sm6 signature structure. https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/181

2 4

[PATCH v5 0/2] MR184: vkd3d-shader/hlsl: Add support for SampleGrad() method
by Ethan Lee (＠flibitijibibo) April 28, 2023

April 28, 2023

~~This one's marked as a draft, as there seems to be a blocker with the method parameters.~~ ~~The first commit totally works, _if_ the ddx/ddy parameters are literals - they do _not_ work when passing a variable of any kind. The test comes from tests/d3d12.c, so I'm mostly just trying to migrate that to the HLSL test suite, but it currently hits an assert before we get to the resource load (which does eventually work) and I'm not sure what's causing it:~~ ``` vkd3d-compiler: libs/vkd3d-shader/tpf.c:3190: sm4_register_from_node: Assertion `instr->reg.allocated' failed. ``` ~~Seems like it's surprised when we try to load from the constant buffer maybe?~~ Fixed! -- v5: tests: Add a basic compilation test for SampleGrad() method. vkd3d-shader/hlsl: Add support for SampleGrad() method https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/184

2 4

[PATCH v6 0/2] MR179: vkd3d-shader/hlsl: Add support for ddx(), ddy() intrinsics.
by Ethan Lee (＠flibitijibibo) April 28, 2023

April 28, 2023

SPIR-V already handled DSX/DSY, so only D3DBC/TPF needed new case blocks. You'll notice that there's no test for this one - in addition to being a pretty straightforward translation for all possible formats, this feature uses the render target width/height and I wasn't sure if there was a good way to ensure that the test would always make sense. Instead, I did the test manually, and it's what you'd expect (EDIT: Previously the test used a uniform which always optimized to 0, new test uses VPOS instead): HLSL: ``` float4 main(float4 pos : sv_position) : sv_target { float4 x = ddx(pos.x); float4 y = ddy(pos.y); return x + y; } ``` D3DBC: ``` ps_3_0 dcl_position0 vPos mov r0.xyzw, vPos.xyzw mov r1.x, r0.x dsx r1.x, r1.x mov r0.x, r0.yxxx dsy r0.x, r0.x mov r1.xyzw, r1.x mov r0.xyzw, r0.x add r0.xyzw, r1.xyzw, r0.xyzw mov oC0.xyzw, r0.xyzw ``` DXBC-TPF: ``` ps_4_0 dcl_input_ps_siv linear v0.xyzw, position dcl_output o0.xyzw dcl_temps 2 mov r0.xyzw, v0.xyzw mov r1.x, r0.x dsx r1.x, r1.x mov r0.x, r0.yxxx dsy r0.x, r0.x mov r1.xyzw, r1.x mov r0.xyzw, r0.x add r0.xyzw, r1.xyzw, r0.xyzw mov o0.xyzw, r0.xyzw ret ``` Fixes https://bugs.winehq.org/show_bug.cgi?id=54827 -- v6: tests: Add tests for ddx(), ddy() intrinsics. https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/179

2 3

[PATCH v4 0/2] MR184: vkd3d-shader/hlsl: Add support for SampleGrad() method
by Ethan Lee (＠flibitijibibo) April 28, 2023

April 28, 2023

~~This one's marked as a draft, as there seems to be a blocker with the method parameters.~~ ~~The first commit totally works, _if_ the ddx/ddy parameters are literals - they do _not_ work when passing a variable of any kind. The test comes from tests/d3d12.c, so I'm mostly just trying to migrate that to the HLSL test suite, but it currently hits an assert before we get to the resource load (which does eventually work) and I'm not sure what's causing it:~~ ``` vkd3d-compiler: libs/vkd3d-shader/tpf.c:3190: sm4_register_from_node: Assertion `instr->reg.allocated' failed. ``` ~~Seems like it's surprised when we try to load from the constant buffer maybe?~~ Fixed! -- v4: tests: Add a basic compilation test for SampleGrad() method. vkd3d-shader/hlsl: Add support for SampleGrad() method https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/184

3 4

[PATCH v5 0/2] MR179: vkd3d-shader/hlsl: Add support for ddx(), ddy() intrinsics.
by Ethan Lee (＠flibitijibibo) April 28, 2023

April 28, 2023

SPIR-V already handled DSX/DSY, so only D3DBC/TPF needed new case blocks. You'll notice that there's no test for this one - in addition to being a pretty straightforward translation for all possible formats, this feature uses the render target width/height and I wasn't sure if there was a good way to ensure that the test would always make sense. Instead, I did the test manually, and it's what you'd expect (EDIT: Previously the test used a uniform which always optimized to 0, new test uses VPOS instead): HLSL: ``` float4 main(float4 pos : sv_position) : sv_target { float4 x = ddx(pos.x); float4 y = ddy(pos.y); return x + y; } ``` D3DBC: ``` ps_3_0 dcl_position0 vPos mov r0.xyzw, vPos.xyzw mov r1.x, r0.x dsx r1.x, r1.x mov r0.x, r0.yxxx dsy r0.x, r0.x mov r1.xyzw, r1.x mov r0.xyzw, r0.x add r0.xyzw, r1.xyzw, r0.xyzw mov oC0.xyzw, r0.xyzw ``` DXBC-TPF: ``` ps_4_0 dcl_input_ps_siv linear v0.xyzw, position dcl_output o0.xyzw dcl_temps 2 mov r0.xyzw, v0.xyzw mov r1.x, r0.x dsx r1.x, r1.x mov r0.x, r0.yxxx dsy r0.x, r0.x mov r1.xyzw, r1.x mov r0.xyzw, r0.x add r0.xyzw, r1.xyzw, r0.xyzw mov o0.xyzw, r0.xyzw ret ``` Fixes https://bugs.winehq.org/show_bug.cgi?id=54827 -- v5: tests: Add test for ddx(), ddy() intrinsics vkd3d-shader/hlsl: Add support for ddx(), ddy() intrinsics. https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/179

4 10

[PATCH v3 0/2] MR184: Draft: vkd3d-shader/hlsl: Add support for SampleGrad() method
by Ethan Lee (＠flibitijibibo) April 28, 2023

April 28, 2023

~~This one's marked as a draft, as there seems to be a blocker with the method parameters.~~ ~~The first commit totally works, _if_ the ddx/ddy parameters are literals - they do _not_ work when passing a variable of any kind. The test comes from tests/d3d12.c, so I'm mostly just trying to migrate that to the HLSL test suite, but it currently hits an assert before we get to the resource load (which does eventually work) and I'm not sure what's causing it:~~ ``` vkd3d-compiler: libs/vkd3d-shader/tpf.c:3190: sm4_register_from_node: Assertion `instr->reg.allocated' failed. ``` ~~Seems like it's surprised when we try to load from the constant buffer maybe?~~ Fixed! -- v3: tests: Add a basic compilation test for SampleGrad() method. https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/184

4 11

[PATCH 0/1] MR2699: evr: Don't flip image vertically.
by eric pouech (＠epo) April 28, 2023

April 28, 2023

This is actually fixing two issues: - if we get a negative stride, then the video transform should have already flipped vertically the image, so we don't need to flip it again. (This is another side effect for handling negative strides in wg_transform). - it also fixes a crash in AoEII, as the image source line offsets were incorrectly computed with unsigned arithmetic (while signed arithmetic was expected), resulting in incorrect sign propagation from 32bit to 64bit integers. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/2699

3 4