wine-commits October 2020

wine-commits@winehq.org

1 participants
796 discussions

Zebediah Figura : tests: Import invalid HLSL shader tests from Wine.
by Alexandre Julliard 05 Oct '20

05 Oct '20

Module: vkd3d Branch: master Commit: ce4c7a16347bd71310aa40e40657f7c15ddb48ac URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ce4c7a16347bd71310aa40e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Oct 3 16:24:26 2020 -0500 tests: Import invalid HLSL shader tests from Wine. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 + tests/hlsl-invalid.shader_test | 117 +++++++++++++++++++++++++++++++++++++++++ tests/shader_runner_d3d12.c | 47 ++++++++++++++--- 3 files changed, 159 insertions(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am index 15be137..93289a2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -53,6 +53,7 @@ vkd3d_shader_tests = \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-comma.shader_test \ + tests/hlsl-invalid.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ @@ -194,6 +195,7 @@ XFAIL_TESTS = \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-comma.shader_test \ + tests/hlsl-invalid.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ diff --git a/tests/hlsl-invalid.shader_test b/tests/hlsl-invalid.shader_test new file mode 100644 index 0000000..16e75d0 --- /dev/null +++ b/tests/hlsl-invalid.shader_test @@ -0,0 +1,117 @@ +[pixel shader fail] +float4 main() : sv_target +{ + return y; +} + +[pixel shader fail] +float4 main() : sv_target +{ + float4 x = float4(0, 0, 0, 0); + x.xzzx = float4(1, 2, 3, 4); + return x; +} + +[pixel shader fail] +float4 main(float2 pos : TEXCOORD0) : sv_target +{ + float4 x = pos; + return x; +} + +[pixel shader fail] +float4 563r(float2 45s : TEXCOORD0) : sv_target +{ + float4 x = 45s; + return float4(x.x, x.y, 0, 0); +} + +[pixel shader fail] +float4 main() : sv_target +{ + struct { int b,c; } x = {0}; + return x; +} + +[pixel shader fail] +float4 main() : sv_target +{ + struct {} x = {}; + return x; +} + +[pixel shader fail] +float4 main(float2 pos : TEXCOORD0) : sv_target +{ + return; +} + +[pixel shader fail] +void main(float2 pos : TEXCOORD0) +{ + return pos; +} + +[pixel shader fail] +float4 main(float2 pos : TEXCOORD0) : sv_target +{ + return pos; +} + +[pixel shader fail] +float4 main() : sv_target +{ + float a[0]; + return 0; +} + +[pixel shader fail] +float4 main() : sv_target +{ + float a[65537]; + return 0; +} + +[pixel shader fail] +float4 main() : sv_target +{ + int x; + float a[(x = 2)]; + return 0; +} + +[pixel shader fail] +uniform float4 main() : sv_target +{ + return 0; +} + +[pixel shader fail] +typedef row_major float4x4 matrix_t; +typedef column_major matrix_t matrix2_t; + +float4 main() : sv_target +{ + return 0; +} + +[pixel shader fail] +float4 main() +{ + return 0; +} + +[pixel shader fail] +float4 main(out float4 o : sv_target) +{ + o = 1; + return 0; +} + +[pixel shader fail] +struct {float4 a;}; + +float4 main() : sv_target +{ + return 0; +} diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 0e9694a..df7076c 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -102,6 +102,7 @@ static ID3D10Blob *compile_shader(const char *source, const char *target) enum parse_state { STATE_NONE, + STATE_SHADER_INVALID_PIXEL, STATE_SHADER_PIXEL, STATE_TEST, }; @@ -269,10 +270,10 @@ START_TEST(shader_runner_d3d12) }; size_t shader_source_size = 0, shader_source_len = 0; enum parse_state state = STATE_NONE; + unsigned int i, line_number = 0; struct shader_context context; const char *filename = NULL; char *shader_source = NULL; - unsigned int i; char line[256]; FILE *f; @@ -304,12 +305,13 @@ START_TEST(shader_runner_d3d12) memset(&context, 0, sizeof(context)); init_test_context(&context.c, &desc); - while (fgets(line, sizeof(line), f)) + for (;;) { - if (line[0] == '\n') - continue; + char *ret = fgets(line, sizeof(line), f); - if (line[0] == '[') + ++line_number; + + if (!ret || line[0] == '[') { switch (state) { @@ -322,14 +324,43 @@ START_TEST(shader_runner_d3d12) return; shader_source_len = 0; break; + + case STATE_SHADER_INVALID_PIXEL: + { + ID3D10Blob *blob = NULL, *errors = NULL; + HRESULT hr; + + hr = D3DCompile(shader_source, strlen(shader_source), NULL, + NULL, NULL, "main", "ps_4_0", 0, 0, &blob, &errors); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(!blob, "Expected no compiled shader blob.\n"); + ok(!!errors, "Expected non-NULL error blob.\n"); + + if (vkd3d_test_state.debug_level) + trace("%s\n", (char *)ID3D10Blob_GetBufferPointer(errors)); + ID3D10Blob_Release(errors); + + shader_source_len = 0; + break; + } } + } + + if (!ret) + break; + if (line[0] == '[') + { if (!strcmp(line, "[pixel shader]\n")) state = STATE_SHADER_PIXEL; + else if (!strcmp(line, "[pixel shader fail]\n")) + state = STATE_SHADER_INVALID_PIXEL; else if (!strcmp(line, "[test]\n")) state = STATE_TEST; + + vkd3d_test_set_context("Section %.*s, line %u", strlen(line) - 1, line, line_number); } - else + else if (line[0] != '\n') { switch (state) { @@ -338,6 +369,7 @@ START_TEST(shader_runner_d3d12) fprintf(stderr, "Ignoring line '%s' in %s.\n", line, argv[1]); break; + case STATE_SHADER_INVALID_PIXEL: case STATE_SHADER_PIXEL: { size_t len = strlen(line); @@ -356,7 +388,8 @@ START_TEST(shader_runner_d3d12) } } - ID3D10Blob_Release(context.ps_code); + if (context.ps_code) + ID3D10Blob_Release(context.ps_code); destroy_test_context(&context.c); fclose(f);

1 0

Zebediah Figura : tests: Import HLSL static initializer tests from Wine.
by Alexandre Julliard 05 Oct '20

05 Oct '20

Module: vkd3d Branch: master Commit: 57a8a908568bb267d3c8012016031b268169359e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=57a8a908568bb267d3c8012… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Oct 3 16:24:25 2020 -0500 tests: Import HLSL static initializer tests from Wine. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 ++ tests/hlsl-static-initializer.shader_test | 15 +++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/Makefile.am b/Makefile.am index ce0d193..15be137 100644 --- a/Makefile.am +++ b/Makefile.am @@ -57,6 +57,7 @@ vkd3d_shader_tests = \ tests/hlsl-majority-typedef.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ + tests/hlsl-static-initializer.shader_test \ tests/hlsl-struct-assignment.shader_test \ tests/hlsl-struct-varying.shader_test \ tests/hlsl-vector-indexing.shader_test \ @@ -197,6 +198,7 @@ XFAIL_TESTS = \ tests/hlsl-majority-typedef.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ + tests/hlsl-static-initializer.shader_test \ tests/hlsl-struct-assignment.shader_test \ tests/hlsl-struct-varying.shader_test \ tests/hlsl-vector-indexing.shader_test \ diff --git a/tests/hlsl-static-initializer.shader_test b/tests/hlsl-static-initializer.shader_test new file mode 100644 index 0000000..9b9d000 --- /dev/null +++ b/tests/hlsl-static-initializer.shader_test @@ -0,0 +1,15 @@ +[pixel shader] +float myfunc() +{ + return 0.6; +} +static float a = myfunc() + 0.2; +static float b; +float4 main() : sv_target +{ + return float4(a, b, 0, 0); +} + +[test] +draw quad +probe all rgba (0.8, 0.0, 0.0, 0.0)

1 0

Zebediah Figura : tests: Import HLSL struct varying tests from Wine.
by Alexandre Julliard 05 Oct '20

05 Oct '20

Module: vkd3d Branch: master Commit: 2c4d4277dd1fdaaf3939cb3a696832d4e942d720 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2c4d4277dd1fdaaf3939cb3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Oct 3 16:24:24 2020 -0500 tests: Import HLSL struct varying tests from Wine. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 ++ tests/hlsl-struct-varying.shader_test | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/Makefile.am b/Makefile.am index f3a5967..ce0d193 100644 --- a/Makefile.am +++ b/Makefile.am @@ -58,6 +58,7 @@ vkd3d_shader_tests = \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ tests/hlsl-struct-assignment.shader_test \ + tests/hlsl-struct-varying.shader_test \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ @@ -197,6 +198,7 @@ XFAIL_TESTS = \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ tests/hlsl-struct-assignment.shader_test \ + tests/hlsl-struct-varying.shader_test \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ diff --git a/tests/hlsl-struct-varying.shader_test b/tests/hlsl-struct-varying.shader_test new file mode 100644 index 0000000..b623a99 --- /dev/null +++ b/tests/hlsl-struct-varying.shader_test @@ -0,0 +1,29 @@ +[pixel shader] +struct input +{ + struct + { + float4 pos : sv_position; + } m; +}; + +struct output +{ + struct + { + float4 color : sv_target; + } m; +}; + +struct output main(struct input i) +{ + struct output o; + o.m.color = i.m.pos; + return o; +} + +[test] +draw quad +probe rgba (0, 1) (0.5, 1.5, 0.0, 1.0) +probe rgba (1, 0) (1.5, 0.5, 0.0, 1.0) +probe rgba (3, 5) (3.5, 5.5, 0.0, 1.0)

1 0

Zebediah Figura : tests: Import HLSL struct assignment tests from Wine.
by Alexandre Julliard 05 Oct '20

05 Oct '20

Module: vkd3d Branch: master Commit: ce7c9649357aeceeaab5eb027603ed1da6912d57 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ce7c9649357aeceeaab5eb0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Oct 3 16:24:23 2020 -0500 tests: Import HLSL struct assignment tests from Wine. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 ++ tests/hlsl-struct-assignment.shader_test | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/Makefile.am b/Makefile.am index 415e686..f3a5967 100644 --- a/Makefile.am +++ b/Makefile.am @@ -57,6 +57,7 @@ vkd3d_shader_tests = \ tests/hlsl-majority-typedef.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ + tests/hlsl-struct-assignment.shader_test \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ @@ -195,6 +196,7 @@ XFAIL_TESTS = \ tests/hlsl-majority-typedef.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ + tests/hlsl-struct-assignment.shader_test \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ diff --git a/tests/hlsl-struct-assignment.shader_test b/tests/hlsl-struct-assignment.shader_test new file mode 100644 index 0000000..ea55b9a --- /dev/null +++ b/tests/hlsl-struct-assignment.shader_test @@ -0,0 +1,23 @@ +[pixel shader] +struct apple +{ + struct + { + float4 a; + } m; + float4 b; +}; + +float4 main() : sv_target +{ + struct apple q, r, s; + + q.m.a = float4(0.1, 0.2, 0.3, 0.4); + q.b = float4(0.5, 0.1, 0.4, 0.5); + s = r = q; + return s.m.a + s.b; +} + +[test] +draw quad +probe all rgba (0.6, 0.3, 0.7, 0.9) 1

1 0

Rémi Bernon : dxgi/tests: Check that the last adapter is always WARP.
by Alexandre Julliard 02 Oct '20

02 Oct '20

Module: wine Branch: master Commit: cce4f36e214125173a8df84d27ba5b33df8d1434 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cce4f36e214125173a8df84d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 2 19:44:01 2020 +0330 dxgi/tests: Check that the last adapter is always WARP. Some games specifically ignore the last adapter from the adapter list, as it's always WARP on Windows. This makes them fail to detect GPUs correctly on Wine, as they drop one of the reported adapters. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index bee2163843..a34f574236 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -5327,9 +5327,12 @@ static void test_multi_adapter(void) unsigned int output_count = 0, expected_output_count = 0; unsigned int adapter_index, output_index, device_index; DXGI_OUTPUT_DESC old_output_desc, output_desc; + DXGI_ADAPTER_DESC1 adapter_desc1; + DXGI_ADAPTER_DESC adapter_desc; DISPLAY_DEVICEW display_device; MONITORINFO monitor_info; DEVMODEW old_mode, mode; + IDXGIAdapter1 *adapter1; IDXGIFactory *factory; IDXGIAdapter *adapter; IDXGIOutput *output; @@ -5531,6 +5534,48 @@ static void test_multi_adapter(void) IDXGIAdapter_Release(adapter); } + /* Windows 8+ always have a WARP adapter present at the end. */ + todo_wine ok(adapter_index >= 2 || broken(adapter_index < 2) /* Windows 7 and before */, + "Got unexpected adapter count %u.\n", adapter_index); + if (adapter_index < 2) + { + todo_wine win_skip("WARP adapter missing, skipping tests.\n"); + goto done; + } + + hr = IDXGIFactory_EnumAdapters(factory, adapter_index - 1, &adapter); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGIAdapter_GetDesc(adapter, &adapter_desc); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(!lstrcmpW(adapter_desc.Description, L"Microsoft Basic Render Driver"), + "Got unexpected description %s.\n", wine_dbgstr_w(adapter_desc.Description)); + todo_wine ok(adapter_desc.VendorId == 0x1414, + "Got unexpected vendor ID %#x.\n", adapter_desc.VendorId); + todo_wine ok(adapter_desc.DeviceId == 0x008c, + "Got unexpected device ID %#x.\n", adapter_desc.DeviceId); + ok(adapter_desc.SubSysId == 0x0000, + "Got unexpected sub-system ID %#x.\n", adapter_desc.SubSysId); + ok(adapter_desc.Revision == 0x0000, + "Got unexpected revision %#x.\n", adapter_desc.Revision); + todo_wine ok(!adapter_desc.DedicatedVideoMemory, + "Got unexpected DedicatedVideoMemory %#lx.\n", adapter_desc.DedicatedVideoMemory); + ok(!adapter_desc.DedicatedSystemMemory, + "Got unexpected DedicatedSystemMemory %#lx.\n", adapter_desc.DedicatedSystemMemory); + + hr = IDXGIAdapter_QueryInterface(adapter, &IID_IDXGIAdapter1, (void **)&adapter1); + ok(hr == S_OK || broken(hr == E_NOINTERFACE), "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + hr = IDXGIAdapter1_GetDesc1(adapter1, &adapter_desc1); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(adapter_desc1.Flags == DXGI_ADAPTER_FLAG_SOFTWARE, + "Got unexpected flags %#x.\n", adapter_desc1.Flags); + IDXGIAdapter1_Release(adapter1); + } + + IDXGIAdapter_Release(adapter); + +done: IDXGIFactory_Release(factory); expected_output_count = GetSystemMetrics(SM_CMONITORS);

1 0

Biswapriyo Nath : include: Add the D3D12_SHADER_VERSION_TYPE enumeration.
by Alexandre Julliard 02 Oct '20

02 Oct '20

Module: wine Branch: master Commit: 1f85606e6b1893611f1513340b520399d29849d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f85606e6b1893611f151334… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri Oct 2 19:44:00 2020 +0330 include: Add the D3D12_SHADER_VERSION_TYPE enumeration. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d12shader.idl | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/d3d12shader.idl b/include/d3d12shader.idl index 9cf39c6cc3..f6cc35a843 100644 --- a/include/d3d12shader.idl +++ b/include/d3d12shader.idl @@ -20,6 +20,17 @@ import "oaidl.idl"; import "ocidl.idl"; import "d3dcommon.idl"; +typedef enum D3D12_SHADER_VERSION_TYPE +{ + D3D12_SHVER_PIXEL_SHADER = 0x0, + D3D12_SHVER_VERTEX_SHADER = 0x1, + D3D12_SHVER_GEOMETRY_SHADER = 0x2, + D3D12_SHVER_HULL_SHADER = 0x3, + D3D12_SHVER_DOMAIN_SHADER = 0x4, + D3D12_SHVER_COMPUTE_SHADER = 0x5, + D3D12_SHVER_RESERVED0 = 0xfff0, +} D3D12_SHADER_VERSION_TYPE; + typedef struct _D3D12_SHADER_DESC { UINT Version;

1 0

Józef Kucia : include: Move the ID3D12Debug interface to d3d12sdklayers.idl.
by Alexandre Julliard 02 Oct '20

02 Oct '20

Module: wine Branch: master Commit: 99f2a5cd9fa363d659acabc9440b44f8dd38b51c URL: https://source.winehq.org/git/wine.git/?a=commit;h=99f2a5cd9fa363d659acabc9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Oct 2 19:43:59 2020 +0330 include: Move the ID3D12Debug interface to d3d12sdklayers.idl. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d12/tests/d3d12.c | 1 + dlls/dxgi/tests/dxgi.c | 1 + include/Makefile.in | 1 + include/d3d12.idl | 11 ----------- include/d3d12sdklayers.idl | 30 ++++++++++++++++++++++++++++++ 5 files changed, 33 insertions(+), 11 deletions(-) diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c index 8c57f07357..f5a4c2ba11 100644 --- a/dlls/d3d12/tests/d3d12.c +++ b/dlls/d3d12/tests/d3d12.c @@ -21,6 +21,7 @@ #define COBJMACROS #include "initguid.h" #include "d3d12.h" +#include "d3d12sdklayers.h" #include "dxgi1_6.h" #include "wine/test.h" diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index ce1aee5ee3..bee2163843 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -24,6 +24,7 @@ #include "dxgi1_6.h" #include "d3d11.h" #include "d3d12.h" +#include "d3d12sdklayers.h" #include "winternl.h" #include "ddk/d3dkmthk.h" #include "wine/heap.h" diff --git a/include/Makefile.in b/include/Makefile.in index 91a02645c3..10a9bd7aa8 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -110,6 +110,7 @@ SOURCES = \ d3d11sdklayers.idl \ d3d11shader.h \ d3d12.idl \ + d3d12sdklayers.idl \ d3d12shader.idl \ d3d8.h \ d3d8caps.h \ diff --git a/include/d3d12.idl b/include/d3d12.idl index 201e01f07e..8b1e85fcef 100644 --- a/include/d3d12.idl +++ b/include/d3d12.idl @@ -2138,17 +2138,6 @@ interface ID3D12Device : ID3D12Object LUID GetAdapterLuid(); } -[ - uuid(344488b7-6846-474b-b989-f027448245e0), - object, - local, - pointer_default(unique) -] -interface ID3D12Debug : IUnknown -{ - void EnableDebugLayer(); -} - [ uuid(34ab647b-3cc8-46ac-841b-c0965645c046), object, diff --git a/include/d3d12sdklayers.idl b/include/d3d12sdklayers.idl new file mode 100644 index 0000000000..dfbb738217 --- /dev/null +++ b/include/d3d12sdklayers.idl @@ -0,0 +1,30 @@ +/* + * Copyright 2016-2019 Józef Kucia for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "d3d12.idl"; + +[ + uuid(344488b7-6846-474b-b989-f027448245e0), + object, + local, + pointer_default(unique) +] +interface ID3D12Debug : IUnknown +{ + void EnableDebugLayer(); +}

1 0

Hans Leidekker : dssenh/tests: Get rid of workarounds for old Windows versions.
by Alexandre Julliard 02 Oct '20

02 Oct '20

Module: wine Branch: master Commit: 2e11036feb02913100dc7d2fa40b5fcd18c90dba URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e11036feb02913100dc7d2f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 2 16:56:44 2020 +0200 dssenh/tests: Get rid of workarounds for old Windows versions. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/tests/dssenh.c | 204 ++++++++++++++++++--------------------------- 1 file changed, 81 insertions(+), 123 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2e11036feb02913100dc…

1 0

Nikolay Sivov : evr/presenter: Add missing method stubs.
by Alexandre Julliard 02 Oct '20

02 Oct '20

Module: wine Branch: master Commit: 82c64b9c951777b0143e3125f4b95a3ac6e091c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82c64b9c951777b0143e3125… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 2 14:01:13 2020 +0300 evr/presenter: Add missing method stubs. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 0663383b14..04e9a55684 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -563,6 +563,48 @@ static HRESULT WINAPI video_presenter_control_GetCurrentImage(IMFVideoDisplayCon return E_NOTIMPL; } +static HRESULT WINAPI video_presenter_control_SetBorderColor(IMFVideoDisplayControl *iface, COLORREF color) +{ + FIXME("%p, %#x.\n", iface, color); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_control_GetBorderColor(IMFVideoDisplayControl *iface, COLORREF *color) +{ + FIXME("%p, %p.\n", iface, color); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_control_SetRenderingPrefs(IMFVideoDisplayControl *iface, DWORD flags) +{ + FIXME("%p, %#x.\n", iface, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_control_GetRenderingPrefs(IMFVideoDisplayControl *iface, DWORD *flags) +{ + FIXME("%p, %p.\n", iface, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_control_SetFullscreen(IMFVideoDisplayControl *iface, BOOL fullscreen) +{ + FIXME("%p, %d.\n", iface, fullscreen); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_control_GetFullscreen(IMFVideoDisplayControl *iface, BOOL *fullscreen) +{ + FIXME("%p, %p.\n", iface, fullscreen); + + return E_NOTIMPL; +} + static const IMFVideoDisplayControlVtbl video_presenter_control_vtbl = { video_presenter_control_QueryInterface, @@ -578,6 +620,12 @@ static const IMFVideoDisplayControlVtbl video_presenter_control_vtbl = video_presenter_control_GetVideoWindow, video_presenter_control_RepaintVideo, video_presenter_control_GetCurrentImage, + video_presenter_control_SetBorderColor, + video_presenter_control_GetBorderColor, + video_presenter_control_SetRenderingPrefs, + video_presenter_control_GetRenderingPrefs, + video_presenter_control_SetFullscreen, + video_presenter_control_GetFullscreen, }; static HRESULT WINAPI video_presenter_rate_support_QueryInterface(IMFRateSupport *iface, REFIID riid, void **obj)

1 0

Nikolay Sivov : evr/presenter: Maintain video position rectangles.
by Alexandre Julliard 02 Oct '20

02 Oct '20

Module: wine Branch: master Commit: 3981be41287c799e43693d80a9c0f4d34d2c0135 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3981be41287c799e43693d80… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 2 14:01:12 2020 +0300 evr/presenter: Maintain video position rectangles. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 43 ++++++++++++++++++++++++++++------ dlls/evr/tests/evr.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+), 7 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index a8e9a50792..0663383b14 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -59,6 +59,8 @@ struct video_presenter IDirect3DDeviceManager9 *device_manager; UINT reset_token; HWND video_window; + MFVideoNormalizedRect src_rect; + RECT dst_rect; unsigned int state; CRITICAL_SECTION cs; }; @@ -467,19 +469,45 @@ static HRESULT WINAPI video_presenter_control_GetIdealVideoSize(IMFVideoDisplayC } static HRESULT WINAPI video_presenter_control_SetVideoPosition(IMFVideoDisplayControl *iface, - const MFVideoNormalizedRect *source, const RECT *dest) + const MFVideoNormalizedRect *src_rect, const RECT *dst_rect) { - FIXME("%p, %p, %p.\n", iface, source, dest); + struct video_presenter *presenter = impl_from_IMFVideoDisplayControl(iface); - return E_NOTIMPL; + TRACE("%p, %p, %s.\n", iface, src_rect, wine_dbgstr_rect(dst_rect)); + + if (!src_rect && !dst_rect) + return E_POINTER; + + if (src_rect && (src_rect->left < 0.0f || src_rect->top < 0.0f || + src_rect->right > 1.0f || src_rect->bottom > 1.0f)) + return E_INVALIDARG; + + EnterCriticalSection(&presenter->cs); + if (src_rect) + presenter->src_rect = *src_rect; + if (dst_rect) + presenter->dst_rect = *dst_rect; + LeaveCriticalSection(&presenter->cs); + + return S_OK; } -static HRESULT WINAPI video_presenter_control_GetVideoPosition(IMFVideoDisplayControl *iface, MFVideoNormalizedRect *source, - RECT *dest) +static HRESULT WINAPI video_presenter_control_GetVideoPosition(IMFVideoDisplayControl *iface, MFVideoNormalizedRect *src_rect, + RECT *dst_rect) { - FIXME("%p, %p, %p.\n", iface, source, dest); + struct video_presenter *presenter = impl_from_IMFVideoDisplayControl(iface); - return E_NOTIMPL; + TRACE("%p, %p, %p.\n", iface, src_rect, dst_rect); + + if (!src_rect || !dst_rect) + return E_POINTER; + + EnterCriticalSection(&presenter->cs); + *src_rect = presenter->src_rect; + *dst_rect = presenter->dst_rect; + LeaveCriticalSection(&presenter->cs); + + return S_OK; } static HRESULT WINAPI video_presenter_control_SetAspectRatioMode(IMFVideoDisplayControl *iface, DWORD mode) @@ -718,6 +746,7 @@ HRESULT evr_presenter_create(IUnknown *outer, void **out) object->IUnknown_inner.lpVtbl = &video_presenter_inner_vtbl; object->outer_unk = outer ? outer : &object->IUnknown_inner; object->refcount = 1; + object->src_rect.right = object->src_rect.bottom = 1.0f; InitializeCriticalSection(&object->cs); if (FAILED(hr = DXVA2CreateDirect3DDeviceManager9(&object->reset_token, &object->device_manager))) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index d77703b6c1..48bf01a2ef 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -970,6 +970,7 @@ static void test_default_presenter(void) D3DPRESENT_PARAMETERS present_params = { 0 }; IMFVideoDisplayControl *display_control; IDirect3DSwapChain9 *swapchain; + MFVideoNormalizedRect src_rect; IMFVideoPresenter *presenter; IMFRateSupport *rate_support; IDirect3DDevice9 *d3d_device; @@ -977,6 +978,7 @@ static void test_default_presenter(void) IMFVideoDeviceID *deviceid; IMFGetService *gs; HWND hwnd, hwnd2; + RECT dst_rect; HANDLE handle; IUnknown *unk; float rate; @@ -1051,6 +1053,7 @@ static void test_default_presenter(void) hr = IDirect3DDeviceManager9_UnlockDevice(dm, handle, FALSE); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + /* Video window */ hwnd = create_window(); ok(!!hwnd, "Failed to create a test window.\n"); @@ -1067,6 +1070,69 @@ static void test_default_presenter(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(hwnd2 == hwnd, "Unexpected window %p.\n", hwnd2); + /* Video position */ + hr = IMFVideoDisplayControl_GetVideoPosition(display_control, NULL, &dst_rect); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoDisplayControl_GetVideoPosition(display_control, &src_rect, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + SetRect(&dst_rect, 1, 2, 3, 4); + hr = IMFVideoDisplayControl_GetVideoPosition(display_control, &src_rect, &dst_rect); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(src_rect.left == 0.0f && src_rect.top == 0.0f && src_rect.right == 1.0f && + src_rect.bottom == 1.0f, "Unexpected source rectangle.\n"); + ok(dst_rect.left == 0 && dst_rect.right == 0 && dst_rect.top == 0 && dst_rect.bottom == 0, + "Unexpected destination rectangle %s.\n", wine_dbgstr_rect(&dst_rect)); + + hr = IMFVideoDisplayControl_SetVideoPosition(display_control, NULL, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + SetRect(&dst_rect, 0, 0, 10, 10); + hr = IMFVideoDisplayControl_SetVideoPosition(display_control, NULL, &dst_rect); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + SetRect(&dst_rect, 1, 2, 3, 4); + hr = IMFVideoDisplayControl_GetVideoPosition(display_control, &src_rect, &dst_rect); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(dst_rect.left == 0 && dst_rect.right == 10 && dst_rect.top == 0 && dst_rect.bottom == 10, + "Unexpected destination rectangle %s.\n", wine_dbgstr_rect(&dst_rect)); + + src_rect.left = src_rect.top = 0.0f; + src_rect.right = 2.0f; + src_rect.bottom = 1.0f; + hr = IMFVideoDisplayControl_SetVideoPosition(display_control, &src_rect, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + src_rect.left = -0.1f; + src_rect.top = 0.0f; + src_rect.right = 0.9f; + src_rect.bottom = 1.0f; + hr = IMFVideoDisplayControl_SetVideoPosition(display_control, &src_rect, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + src_rect.left = 0.1f; + src_rect.top = 0.2f; + src_rect.right = 0.8f; + src_rect.bottom = 0.9f; + hr = IMFVideoDisplayControl_SetVideoPosition(display_control, &src_rect, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoDisplayControl_GetVideoPosition(display_control, &src_rect, &dst_rect); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(src_rect.left == 0.1f && src_rect.top == 0.2f && src_rect.right == 0.8f && + src_rect.bottom == 0.9f, "Unexpected source rectangle.\n"); + + SetRect(&dst_rect, 1, 2, 999, 1000); + hr = IMFVideoDisplayControl_SetVideoPosition(display_control, NULL, &dst_rect); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + SetRect(&dst_rect, 0, 1, 3, 4); + hr = IMFVideoDisplayControl_GetVideoPosition(display_control, &src_rect, &dst_rect); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(dst_rect.left == 1 && dst_rect.right == 999 && dst_rect.top == 2 && dst_rect.bottom == 1000, + "Unexpected destination rectangle %s.\n", wine_dbgstr_rect(&dst_rect)); + hr = IDirect3DDeviceManager9_CloseDeviceHandle(dm, handle); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

← Newer
1
...
69
70
71
72
73
74
75
...
80
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2020