April 2023 - Wine-commits - list.winehq.org

Davide Beatrici : mmdevapi: Add missing includes and typedef to mmdevdrv.h.
by Alexandre Julliard 14 Apr '23

14 Apr '23

Module: wine Branch: master Commit: 27d88669b4c48f0c3b904741e50dcb20266be06e URL: https://gitlab.winehq.org/wine/wine/-/commit/27d88669b4c48f0c3b904741e50dcb… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Thu Apr 13 08:44:00 2023 +0200 mmdevapi: Add missing includes and typedef to mmdevdrv.h. --- dlls/mmdevapi/mmdevdrv.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/mmdevapi/mmdevdrv.h b/dlls/mmdevapi/mmdevdrv.h index f184f3cecc9..5c26b1b34d8 100644 --- a/dlls/mmdevapi/mmdevdrv.h +++ b/dlls/mmdevapi/mmdevdrv.h @@ -14,6 +14,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <audiopolicy.h> +#include <mmdeviceapi.h> + +#include <wine/list.h> + +typedef UINT64 stream_handle; + typedef struct audio_client ACImpl; typedef struct audio_session {

1 0

Piotr Caban : wineps: Fix SetPixel implementation.
by Alexandre Julliard 13 Apr '23

13 Apr '23

Module: wine Branch: master Commit: 20be5ecd401c08ed1de3e93f8314390b00d33d50 URL: https://gitlab.winehq.org/wine/wine/-/commit/20be5ecd401c08ed1de3e93f831439… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 13 20:00:21 2023 +0200 wineps: Fix SetPixel implementation. --- dlls/wineps.drv/graphics.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineps.drv/graphics.c b/dlls/wineps.drv/graphics.c index 94ae51d5764..fc7dcb9fec8 100644 --- a/dlls/wineps.drv/graphics.c +++ b/dlls/wineps.drv/graphics.c @@ -440,7 +440,7 @@ COLORREF CDECL PSDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) /* we bracket the setcolor in gsave/grestore so that we don't trash the current pen colour */ PSDRV_WriteGSave(dev); - PSDRV_WriteRectangle( dev, pt.x, pt.y, 0, 0 ); + PSDRV_WriteRectangle( dev, pt.x, pt.y, 1, 1 ); PSDRV_CreateColor( dev, &pscolor, color ); PSDRV_WriteSetColor( dev, &pscolor ); PSDRV_WriteFill( dev );

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Handle SV_IsFrontFace semantic.
by Alexandre Julliard 13 Apr '23

13 Apr '23

Module: vkd3d Branch: master Commit: ca59a3c35bea55184177cf3afdc34da4905df3fc URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ca59a3c35bea55184177cf3afdc34… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 3 23:16:20 2023 +0200 vkd3d-shader/hlsl: Handle SV_IsFrontFace semantic. --- libs/vkd3d-shader/hlsl_sm4.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 5bd4f2d6..8be848c5 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -115,6 +115,7 @@ bool hlsl_sm4_usage_from_semantic(struct hlsl_ctx *ctx, const struct hlsl_semant {"position", false, VKD3D_SHADER_TYPE_PIXEL, D3D_NAME_POSITION}, {"sv_position", false, VKD3D_SHADER_TYPE_PIXEL, D3D_NAME_POSITION}, + {"sv_isfrontface", false, VKD3D_SHADER_TYPE_PIXEL, D3D_NAME_IS_FRONT_FACE}, {"color", true, VKD3D_SHADER_TYPE_PIXEL, D3D_NAME_TARGET}, {"depth", true, VKD3D_SHADER_TYPE_PIXEL, D3D_NAME_DEPTH},

1 0

Nikolay Sivov : tests: Disable culling in shader runners.
by Alexandre Julliard 13 Apr '23

13 Apr '23

Module: vkd3d Branch: master Commit: a496e3a8ba98ece0219ed3630afbb0df2c9ce09c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a496e3a8ba98ece0219ed3630afbb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 10 20:45:15 2023 +0200 tests: Disable culling in shader runners. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- tests/shader_runner_d3d11.c | 18 ++++++++++++++++++ tests/shader_runner_d3d12.c | 2 +- tests/shader_runner_d3d9.c | 2 ++ tests/shader_runner_vulkan.c | 2 +- 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/tests/shader_runner_d3d11.c b/tests/shader_runner_d3d11.c index 965b8b18..2954cab8 100644 --- a/tests/shader_runner_d3d11.c +++ b/tests/shader_runner_d3d11.c @@ -63,6 +63,7 @@ struct d3d11_shader_runner HWND window; IDXGISwapChain *swapchain; ID3D11DeviceContext *immediate_context; + ID3D11RasterizerState *rasterizer_state; }; static struct d3d11_shader_runner *d3d11_shader_runner(struct shader_runner *r) @@ -250,7 +251,9 @@ static IDXGISwapChain *create_swapchain(ID3D11Device *device, HWND window) static BOOL init_test_context(struct d3d11_shader_runner *runner) { unsigned int rt_width, rt_height; + D3D11_RASTERIZER_DESC rs_desc; D3D11_VIEWPORT vp; + HRESULT hr; RECT rect; memset(runner, 0, sizeof(*runner)); @@ -279,6 +282,19 @@ static BOOL init_test_context(struct d3d11_shader_runner *runner) vp.MaxDepth = 1.0f; ID3D11DeviceContext_RSSetViewports(runner->immediate_context, 1, &vp); + rs_desc.FillMode = D3D11_FILL_SOLID; + rs_desc.CullMode = D3D11_CULL_NONE; + rs_desc.FrontCounterClockwise = FALSE; + rs_desc.DepthBias = 0; + rs_desc.DepthBiasClamp = 0.0f; + rs_desc.SlopeScaledDepthBias = 0.0f; + rs_desc.DepthClipEnable = TRUE; + rs_desc.ScissorEnable = FALSE; + rs_desc.MultisampleEnable = FALSE; + rs_desc.AntialiasedLineEnable = FALSE; + hr = ID3D11Device_CreateRasterizerState(runner->device, &rs_desc, &runner->rasterizer_state); + ok(hr == S_OK, "Failed to create rasterizer state.\n"); + return TRUE; } @@ -286,6 +302,7 @@ static void destroy_test_context(struct d3d11_shader_runner *runner) { ULONG ref; + ID3D11RasterizerState_Release(runner->rasterizer_state); ID3D11DeviceContext_Release(runner->immediate_context); IDXGISwapChain_Release(runner->swapchain); DestroyWindow(runner->window); @@ -594,6 +611,7 @@ static bool d3d11_runner_draw(struct shader_runner *r, ID3D11DeviceContext_IASetPrimitiveTopology(context, primitive_topology); ID3D11DeviceContext_VSSetShader(context, vs, NULL, 0); ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + ID3D11DeviceContext_RSSetState(context, runner->rasterizer_state); ID3D11DeviceContext_Draw(context, vertex_count, 0); diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 87e5d130..54d1c51a 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -380,7 +380,7 @@ static bool d3d12_runner_draw(struct shader_runner *r, pso_desc.PS.pShaderBytecode = ID3D10Blob_GetBufferPointer(ps_code); pso_desc.PS.BytecodeLength = ID3D10Blob_GetBufferSize(ps_code); pso_desc.RasterizerState.FillMode = D3D12_FILL_MODE_SOLID; - pso_desc.RasterizerState.CullMode = D3D12_CULL_MODE_BACK; + pso_desc.RasterizerState.CullMode = D3D12_CULL_MODE_NONE; pso_desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_TRIANGLE; pso_desc.SampleDesc.Count = 1; pso_desc.SampleMask = ~(UINT)0; diff --git a/tests/shader_runner_d3d9.c b/tests/shader_runner_d3d9.c index 51cd6dc9..b983dc08 100644 --- a/tests/shader_runner_d3d9.c +++ b/tests/shader_runner_d3d9.c @@ -418,6 +418,8 @@ static bool d3d9_runner_draw(struct shader_runner *r, ok(hr == D3D_OK, "Failed to set vertex shader, hr %#lx.\n", hr); hr = IDirect3DDevice9_SetPixelShader(device, ps); ok(hr == D3D_OK, "Failed to set pixel shader, hr %#lx.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_NONE); + ok(hr == D3D_OK, "Failed to set cull mode, hr %#lx.\n", hr); hr = IDirect3DDevice9_BeginScene(device); ok(hr == D3D_OK, "Failed to draw, hr %#lx.\n", hr); diff --git a/tests/shader_runner_vulkan.c b/tests/shader_runner_vulkan.c index c7b1dee0..aca17a1a 100644 --- a/tests/shader_runner_vulkan.c +++ b/tests/shader_runner_vulkan.c @@ -619,7 +619,7 @@ static VkPipeline create_graphics_pipeline(const struct vulkan_shader_runner *ru vp_desc.scissorCount = 1; vp_desc.pScissors = &rt_rect; - rs_desc.frontFace = VK_FRONT_FACE_CLOCKWISE; + rs_desc.cullMode = VK_CULL_MODE_NONE; rs_desc.lineWidth = 1.0f; ms_desc.rasterizationSamples = VK_SAMPLE_COUNT_1_BIT;

1 0

Nikolay Sivov : tests: Add a test for SV_IsFrontFace.
by Alexandre Julliard 13 Apr '23

13 Apr '23

Module: vkd3d Branch: master Commit: e4503ad80f9353dad7218495520c4f6899e1d3a8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e4503ad80f9353dad7218495520c4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 10 20:46:25 2023 +0200 tests: Add a test for SV_IsFrontFace. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Makefile.am | 1 + tests/hlsl-is-front-face.shader_test | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/Makefile.am b/Makefile.am index a7abd56a..c7369398 100644 --- a/Makefile.am +++ b/Makefile.am @@ -94,6 +94,7 @@ vkd3d_shader_tests = \ tests/hlsl-initializer-struct.shader_test \ tests/hlsl-intrinsic-override.shader_test \ tests/hlsl-invalid.shader_test \ + tests/hlsl-is-front-face.shader_test \ tests/hlsl-ldexp.shader_test \ tests/hlsl-length.shader_test \ tests/hlsl-lerp.shader_test \ diff --git a/tests/hlsl-is-front-face.shader_test b/tests/hlsl-is-front-face.shader_test new file mode 100644 index 00000000..11447d26 --- /dev/null +++ b/tests/hlsl-is-front-face.shader_test @@ -0,0 +1,36 @@ +[require] +shader model >= 4.0 + +[input layout] +0 r32g32 float sv_position + +[vertex buffer 0] +-2.0 -2.0 + 2.0 -2.0 +-2.0 2.0 + 2.0 2.0 + +[vertex shader] +void main(inout float4 pos : sv_position) +{ +} + +[pixel shader] +float4 main(bool face : sv_isfrontface) : sv_target +{ + return face ? float4(1.0f, 2.0f, 1.0f, 2.0f) : float4(0.0f, 1.0f, 0.0f, 1.0f); +} + +[test] +draw triangle strip 4 +probe all rgba (0.0, 1.0, 0.0, 1.0) + +[vertex buffer 0] +-2.0 -2.0 +-2.0 2.0 + 2.0 -2.0 + 2.0 2.0 + +[test] +draw triangle strip 4 +probe all rgba (1.0, 2.0, 1.0, 2.0)

1 0

Francisco Casas : tests: Test numeric offsets with object fields.
by Alexandre Julliard 13 Apr '23

13 Apr '23

Module: vkd3d Branch: master Commit: 86893bc7f407492d786eaad21948c9aabd45fc4e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/86893bc7f407492d786eaad21948c… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Apr 11 11:58:34 2023 -0400 tests: Test numeric offsets with object fields. --- Makefile.am | 1 + tests/object-field-offsets.shader_test | 70 ++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+) diff --git a/Makefile.am b/Makefile.am index c7369398..36282921 100644 --- a/Makefile.am +++ b/Makefile.am @@ -132,6 +132,7 @@ vkd3d_shader_tests = \ tests/minimum-precision.shader_test \ tests/multiple-rt.shader_test \ tests/nointerpolation.shader_test \ + tests/object-field-offsets.shader_test \ tests/object-references.shader_test \ tests/pow.shader_test \ tests/preproc-if.shader_test \ diff --git a/tests/object-field-offsets.shader_test b/tests/object-field-offsets.shader_test new file mode 100644 index 00000000..ec03cf2e --- /dev/null +++ b/tests/object-field-offsets.shader_test @@ -0,0 +1,70 @@ +[require] +shader model >= 5.0 + +[pixel shader] +struct apple { + float2 a; + Texture2D tex; + sampler sam; + float b; +}; + +uniform apple ap; + +float4 main() : sv_target +{ + return float4(ap.a, ap.b, 0); +} + +[test] +uniform 0 float4 1.0 2.0 3.0 4.0 +uniform 4 float4 5.0 6.0 7.0 8.0 +draw quad +todo probe all rgba (1.0, 2.0, 3.0, 0.0) + + +[pixel shader] +struct apple { + Texture2D tex; + sampler sam; +}; + +struct banana { + float2 a; + apple ap; + float b; +}; + +uniform banana ba; + +float4 main() : sv_target +{ + return float4(ba.a, ba.b, 0); +} + +[test] +uniform 0 float4 1.0 2.0 3.0 4.0 +uniform 4 float4 5.0 6.0 7.0 8.0 +draw quad +probe all rgba (1.0, 2.0, 5.0, 0.0) + + +[pixel shader] +struct apple { + float2 a; + Texture2D tex[2]; + float b; +}; + +uniform apple ap; + +float4 main() : sv_target +{ + return float4(ap.a, ap.b, 0); +} + +[test] +uniform 0 float4 1.0 2.0 3.0 4.0 +uniform 4 float4 5.0 6.0 7.0 8.0 +draw quad +probe all rgba (1.0, 2.0, 5.0, 0.0)

1 0

Francisco Casas : vkd3d-shader/hlsl: Fix numeric offset of object fields.
by Alexandre Julliard 13 Apr '23

13 Apr '23

Module: vkd3d Branch: master Commit: 0ceecd1225248082a690ed13af9188a52e1809d8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0ceecd1225248082a690ed13af918… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Apr 11 12:01:02 2023 -0400 vkd3d-shader/hlsl: Fix numeric offset of object fields. --- libs/vkd3d-shader/hlsl.c | 3 ++- tests/object-field-offsets.shader_test | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 54f3292b..85b6ba8c 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -216,7 +216,8 @@ unsigned int hlsl_type_get_sm4_offset(const struct hlsl_type *type, unsigned int * (b) the type would cross a vec4 boundary; i.e. a vec3 and a * vec1 can be packed together, but not a vec3 and a vec2. */ - if (type->class > HLSL_CLASS_LAST_NUMERIC || (offset & 3) + type->reg_size[HLSL_REGSET_NUMERIC] > 4) + if (type->class == HLSL_CLASS_STRUCT || type->class == HLSL_CLASS_ARRAY + || (offset & 3) + type->reg_size[HLSL_REGSET_NUMERIC] > 4) return align(offset, 4); return offset; } diff --git a/tests/object-field-offsets.shader_test b/tests/object-field-offsets.shader_test index ec03cf2e..8afd9af7 100644 --- a/tests/object-field-offsets.shader_test +++ b/tests/object-field-offsets.shader_test @@ -20,7 +20,7 @@ float4 main() : sv_target uniform 0 float4 1.0 2.0 3.0 4.0 uniform 4 float4 5.0 6.0 7.0 8.0 draw quad -todo probe all rgba (1.0, 2.0, 3.0, 0.0) +probe all rgba (1.0, 2.0, 3.0, 0.0) [pixel shader]

1 0

Francisco Casas : tests: Test multiple calls to the same function in initializers.
by Alexandre Julliard 13 Apr '23

13 Apr '23

Module: vkd3d Branch: master Commit: 9dd99a084de146bbe0caeffbe1b21d643052c137 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9dd99a084de146bbe0caeffbe1b21… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Feb 14 21:00:17 2023 -0300 tests: Test multiple calls to the same function in initializers. --- tests/hlsl-function.shader_test | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/tests/hlsl-function.shader_test b/tests/hlsl-function.shader_test index c836808d..a7cad6d7 100644 --- a/tests/hlsl-function.shader_test +++ b/tests/hlsl-function.shader_test @@ -261,3 +261,37 @@ float4 main() : sv_target func(true); return 0; } + + +[pixel shader] +float func(float a) +{ + return a + 1; +} + +float4 main() : sv_target +{ + return float4(func(1.0), func(2.0), func(5.0), func(6.0)); +} + +[test] +draw quad +todo probe all rgba (2.0, 3.0, 6.0, 7.0) + + +[pixel shader] +float func(float a) +{ + return a + 1; +} + +float4 main() : sv_target +{ + float4 a = {func(1.0), func(2.0), func(5.0), func(6.0)}; + + return a; +} + +[test] +draw quad +todo probe all rgba (2.0, 3.0, 6.0, 7.0)

1 0

Francisco Casas : tests: Test matrix indexing on the lhs.
by Alexandre Julliard 13 Apr '23

13 Apr '23

Module: vkd3d Branch: master Commit: 1b1978f684ed6777b5c215b28ee3312c8fddc098 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1b1978f684ed6777b5c215b28ee33… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Mar 7 11:51:04 2023 -0300 tests: Test matrix indexing on the lhs. --- tests/hlsl-matrix-indexing.shader_test | 62 ++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/tests/hlsl-matrix-indexing.shader_test b/tests/hlsl-matrix-indexing.shader_test index 716b43d4..74152d17 100644 --- a/tests/hlsl-matrix-indexing.shader_test +++ b/tests/hlsl-matrix-indexing.shader_test @@ -76,3 +76,65 @@ float4 main() : SV_TARGET [test] draw quad probe all rgba (1.0, 5.0, 7.0, 12.0) + + +[pixel shader] +float4 main() : SV_TARGET +{ + float3x2 m = {1, 2, 3, 4, 5, 6}; + + m[1] = float2(30, 40); + + return float4(m[1], m[2]); +} + +[test] +draw quad +todo probe all rgba (30.0, 40.0, 5.0, 6.0) + + +[pixel shader] +float4 main() : SV_TARGET +{ + row_major float3x2 m = {1, 2, 3, 4, 5, 6}; + + m[2] = float2(50, 60); + + return float4(m[1], m[2]); +} + +[test] +draw quad +probe all rgba (3.0, 4.0, 50.0, 60.0) + + +[pixel shader todo] +uniform float i; + +float4 main() : sv_target +{ + float4x4 mat = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}; + + return mat[i]; +} + +[test] +uniform 0 float 2 +todo draw quad +todo probe all rgba (8, 9, 10, 11) + + +[pixel shader todo] +uniform float i; + +float4 main() : sv_target +{ + row_major float4x4 mat = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}; + + return mat[i]; +} + +[test] +uniform 0 float 3 +todo draw quad +todo probe all rgba (12, 13, 14, 15)

1 0

Zebediah Figura : tests: Test side effects on indexes.
by Alexandre Julliard 13 Apr '23

13 Apr '23

Module: vkd3d Branch: master Commit: 526b025c88d01b68866290c41085b0477ea01886 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/526b025c88d01b68866290c41085b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 23 15:47:55 2023 -0300 tests: Test side effects on indexes. Co-authored-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 1 + tests/side-effects.shader_test | 47 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/Makefile.am b/Makefile.am index 36282921..46057965 100644 --- a/Makefile.am +++ b/Makefile.am @@ -149,6 +149,7 @@ vkd3d_shader_tests = \ tests/sampler-offset.shader_test \ tests/saturate.shader_test \ tests/shader-interstage-interface.shader_test \ + tests/side-effects.shader_test \ tests/sqrt.shader_test \ tests/step.shader_test \ tests/swizzle-constant-prop.shader_test \ diff --git a/tests/side-effects.shader_test b/tests/side-effects.shader_test new file mode 100644 index 00000000..b64a9dd4 --- /dev/null +++ b/tests/side-effects.shader_test @@ -0,0 +1,47 @@ +[pixel shader] +float4 main() : sv_target +{ + float x[3] = {0, 2, 3}; + + return x[x[1] = 1]; +} + +[test] +draw quad +probe all rgba (1.0, 1.0, 1.0, 1.0) + + +[pixel shader] +uint4 func(uint t) +{ + return uint4(t + 0, t + 1, t + 2, t + 3); +} + +float4 main() : sv_target +{ + return func(10)[func(0).y]; +} + +[test] +draw quad +todo probe all rgba (11.0, 11.0, 11.0, 11.0) + + +[pixel shader] +float4 func(void) +{ + static uint i; + + i += 1; + + return float4(0.1, 0.2, 0.3, 0.4) + i; +} + +float4 main() : sv_target +{ + return func()[func().x]; +} + +[test] +draw quad +todo probe all rgba (2.2, 2.2, 2.2, 2.2)

1 0