wine-commits January 2021

wine-commits@winehq.org

2 participants
472 discussions

Rémi Bernon : d2d1/tests: Pass a d2d1_test_context structure get_surface_readback().
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: aff25e42b18a6b12044263d361d5a03e74c3230c URL: https://source.winehq.org/git/wine.git/?a=commit;h=aff25e42b18a6b12044263d3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 15 21:48:02 2021 +0330 d2d1/tests: Pass a d2d1_test_context structure get_surface_readback(). 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/d2d1/tests/d2d1.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 38fe6c4ff7d..6f8aac4fd04 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -311,8 +311,9 @@ static void cubic_to(ID2D1GeometrySink *sink, float x1, float y1, float x2, floa ID2D1GeometrySink_AddBezier(sink, &b); } -static void get_surface_readback(IDXGISurface *surface, struct resource_readback *rb) +static void get_surface_readback(struct d2d1_test_context *ctx, struct resource_readback *rb) { + IDXGISurface *surface = ctx->surface; D3D10_TEXTURE2D_DESC texture_desc; D3D10_MAPPED_TEXTURE2D map_desc; DXGI_SURFACE_DESC surface_desc; @@ -466,7 +467,7 @@ static BOOL compare_surface(struct d2d1_test_context *ctx, const char *ref_sha1) struct resource_readback rb; BOOL ret; - get_surface_readback(ctx->surface, &rb); + get_surface_readback(ctx, &rb); ret = compare_sha1(rb.data, rb.pitch, 4, rb.width, rb.height, ref_sha1); release_resource_readback(&rb); @@ -638,7 +639,7 @@ static BOOL compare_figure(struct d2d1_test_context *ctx, unsigned int x, unsign unsigned int i, j, span, diff; struct resource_readback rb; - get_surface_readback(ctx->surface, &rb); + get_surface_readback(ctx, &rb); figure.span_count = 0; figure.spans_size = 64; @@ -2170,7 +2171,7 @@ static void test_linear_brush(void) hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); - get_surface_readback(ctx.surface, &rb); + get_surface_readback(&ctx, &rb); for (i = 0; i < ARRAY_SIZE(test1); ++i) { DWORD colour; @@ -2243,7 +2244,7 @@ static void test_linear_brush(void) hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); - get_surface_readback(ctx.surface, &rb); + get_surface_readback(&ctx, &rb); for (i = 0; i < ARRAY_SIZE(test2); ++i) { DWORD colour; @@ -2367,7 +2368,7 @@ static void test_radial_brush(void) hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); - get_surface_readback(ctx.surface, &rb); + get_surface_readback(&ctx, &rb); for (i = 0; i < ARRAY_SIZE(test1); ++i) { DWORD colour; @@ -2442,7 +2443,7 @@ static void test_radial_brush(void) hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); - get_surface_readback(ctx.surface, &rb); + get_surface_readback(&ctx, &rb); for (i = 0; i < ARRAY_SIZE(test2); ++i) { DWORD colour;

1 0

Rémi Bernon : d2d1/tests: Pass a d2d1_test_context structure to compare_figure().
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: 1b2e27fe498299928091f40038652d8ae63eecc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b2e27fe498299928091f400… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 15 21:48:01 2021 +0330 d2d1/tests: Pass a d2d1_test_context structure to compare_figure(). 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/d2d1/tests/d2d1.c | 296 ++++++++++++++++++++++++------------------------- 1 file changed, 148 insertions(+), 148 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1b2e27fe498299928091…

1 0

Rémi Bernon : d2d1/tests: Pass a d2d1_test_context structure to compare_surface().
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: f5bb97d28f20ce0040d77f508998c1e75d32f86a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5bb97d28f20ce0040d77f50… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 15 21:48:00 2021 +0330 d2d1/tests: Pass a d2d1_test_context structure to compare_surface(). 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/d2d1/tests/d2d1.c | 52 +++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f5bb97d28f20ce0040d7…

1 0

Rémi Bernon : d2d1/tests: Store the resource data pointer and row-pitch directly in struct resource_readback.
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: aab3f4b7fe8ba0d7f6da015872e7a6726846a588 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aab3f4b7fe8ba0d7f6da0158… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 15 21:47:59 2021 +0330 d2d1/tests: Store the resource data pointer and row-pitch directly in struct resource_readback. 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/d2d1/tests/d2d1.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index c8c0e83df1c..a1869dcaaaa 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -54,8 +54,8 @@ struct d2d1_test_context struct resource_readback { ID3D10Resource *resource; - D3D10_MAPPED_TEXTURE2D map_desc; - unsigned int width, height; + unsigned int pitch, width, height; + void *data; }; struct figure @@ -314,6 +314,7 @@ static void cubic_to(ID2D1GeometrySink *sink, float x1, float y1, float x2, floa static void get_surface_readback(IDXGISurface *surface, struct resource_readback *rb) { D3D10_TEXTURE2D_DESC texture_desc; + D3D10_MAPPED_TEXTURE2D map_desc; DXGI_SURFACE_DESC surface_desc; ID3D10Resource *src_resource; ID3D10Device *device; @@ -346,8 +347,11 @@ static void get_surface_readback(IDXGISurface *surface, struct resource_readback ID3D10Resource_Release(src_resource); ID3D10Device_Release(device); - hr = ID3D10Texture2D_Map((ID3D10Texture2D *)rb->resource, 0, D3D10_MAP_READ, 0, &rb->map_desc); + hr = ID3D10Texture2D_Map((ID3D10Texture2D *)rb->resource, 0, D3D10_MAP_READ, 0, &map_desc); ok(SUCCEEDED(hr), "Failed to map texture, hr %#x.\n", hr); + + rb->pitch = map_desc.RowPitch; + rb->data = map_desc.pData; } static void release_resource_readback(struct resource_readback *rb) @@ -358,7 +362,7 @@ static void release_resource_readback(struct resource_readback *rb) static DWORD get_readback_colour(struct resource_readback *rb, unsigned int x, unsigned int y) { - return ((DWORD *)((BYTE *)rb->map_desc.pData + y * rb->map_desc.RowPitch))[x]; + return ((DWORD *)((BYTE *)rb->data + y * rb->pitch))[x]; } static BOOL compare_uint(unsigned int x, unsigned int y, unsigned int max_diff) @@ -463,8 +467,7 @@ static BOOL compare_surface(IDXGISurface *surface, const char *ref_sha1) BOOL ret; get_surface_readback(surface, &rb); - ret = compare_sha1(rb.map_desc.pData, rb.map_desc.RowPitch, 4, - rb.width, rb.height, ref_sha1); + ret = compare_sha1(rb.data, rb.pitch, 4, rb.width, rb.height, ref_sha1); release_resource_readback(&rb); return ret; @@ -641,7 +644,7 @@ static BOOL compare_figure(IDXGISurface *surface, unsigned int x, unsigned int y figure.spans_size = 64; figure.spans = HeapAlloc(GetProcessHeap(), 0, figure.spans_size * sizeof(*figure.spans)); - read_figure(&figure, rb.map_desc.pData, rb.map_desc.RowPitch, x, y, w, h, prev); + read_figure(&figure, rb.data, rb.pitch, x, y, w, h, prev); deserialize_figure(&ref_figure, (BYTE *)ref); span = w * h; @@ -679,7 +682,7 @@ static BOOL compare_figure(IDXGISurface *surface, unsigned int x, unsigned int y if (diff > max_diff) { trace("diff %u > max_diff %u.\n", diff, max_diff); - read_figure(&figure, rb.map_desc.pData, rb.map_desc.RowPitch, x, y, w, h, prev); + read_figure(&figure, rb.data, rb.pitch, x, y, w, h, prev); serialize_figure(&figure); }

1 0

Rémi Bernon : d2d1/tests: Create a Direct2D render target in init_test_context_().
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: 85f3ba90e520e49be32ce2118e1cab771766a94c URL: https://source.winehq.org/git/wine.git/?a=commit;h=85f3ba90e520e49be32ce211… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 15 21:47:58 2021 +0330 d2d1/tests: Create a Direct2D render target in init_test_context_(). 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/d2d1/tests/d2d1.c | 131 +++++++++++++++---------------------------------- 1 file changed, 40 insertions(+), 91 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=85f3ba90e520e49be32c…

1 0

Rémi Bernon : d2d1/tests: Retrieve the swapchain back-buffer in init_test_context_().
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: 1a12eb08be86b3c805366e1dfad9d6eced168dad URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a12eb08be86b3c805366e1d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 15 21:47:57 2021 +0330 d2d1/tests: Retrieve the swapchain back-buffer in init_test_context_(). 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/d2d1/tests/d2d1.c | 507 +++++++++++++++++++++---------------------------- 1 file changed, 212 insertions(+), 295 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1a12eb08be86b3c80536…

1 0

Rémi Bernon : d2d1/tests: Create a swapchain in init_test_context_().
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: 7b312cd1be5fff36e11a87e6271bdd6cf40084a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b312cd1be5fff36e11a87e6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 15 21:47:56 2021 +0330 d2d1/tests: Create a swapchain in init_test_context_(). 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/d2d1/tests/d2d1.c | 118 ++++++++++++------------------------------------- 1 file changed, 28 insertions(+), 90 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7b312cd1be5fff36e11a…

1 0

Rémi Bernon : d2d1/tests: Create a window in init_test_context_().
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: acd9b6a45aa0890e1fe48f3d7feb98c484b60c17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=acd9b6a45aa0890e1fe48f3d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 15 21:47:55 2021 +0330 d2d1/tests: Create a window in init_test_context_(). 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/d2d1/tests/d2d1.c | 120 ++++++++++++------------------------------------- 1 file changed, 29 insertions(+), 91 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=acd9b6a45aa0890e1fe4…

1 0

Rémi Bernon : d2d1/tests: Introduce init_test_context().
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: 02634c3d75c8b1a12c3f12295a2562a71ca503aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=02634c3d75c8b1a12c3f1229… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 15 21:47:54 2021 +0330 d2d1/tests: Introduce init_test_context(). Analogous to the d3d11 tests. 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/d2d1/tests/d2d1.c | 374 ++++++++++++++++++++++--------------------------- 1 file changed, 167 insertions(+), 207 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=02634c3d75c8b1a12c3f…

1 0

Rémi Bernon : d2d1/tests: Check for d2d1 math functions presence.
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: babd036a79841f1da65b72ae5dd512b2b316d213 URL: https://source.winehq.org/git/wine.git/?a=commit;h=babd036a79841f1da65b72ae… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 15 21:47:53 2021 +0330 d2d1/tests: Check for d2d1 math functions presence. 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/d2d1/tests/d2d1.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 8627f5ebef6..37cdda0aae6 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -30,6 +30,9 @@ static HRESULT (WINAPI *pD2D1CreateDevice)(IDXGIDevice *dxgi_device, const D2D1_CREATION_PROPERTIES *properties, ID2D1Device **device); +static void (WINAPI *pD2D1SinCos)(float angle, float *s, float *c); +static float (WINAPI *pD2D1Tan)(float angle); +static float (WINAPI *pD2D1Vec3Length)(float x, float y, float z); static BOOL use_mt = TRUE; @@ -9585,9 +9588,15 @@ static void test_math(void) {1.0f, 2.0f, 3.0f, 3.74165750f}, }; + if (!pD2D1SinCos || !pD2D1Tan || !pD2D1Vec3Length) + { + win_skip("D2D1SinCos/D2D1Tan/D2D1Vec3Length not available, skipping test.\n"); + return; + } + for (i = 0; i < ARRAY_SIZE(sc_data); ++i) { - D2D1SinCos(sc_data[i].x, &s, &c); + pD2D1SinCos(sc_data[i].x, &s, &c); ok(compare_float(s, sc_data[i].s, 0), "Test %u: Got unexpected sin %.8e, expected %.8e.\n", i, s, sc_data[i].s); ok(compare_float(c, sc_data[i].c, 0), @@ -9596,14 +9605,14 @@ static void test_math(void) for (i = 0; i < ARRAY_SIZE(t_data); ++i) { - t = D2D1Tan(t_data[i].x); + t = pD2D1Tan(t_data[i].x); ok(compare_float(t, t_data[i].t, 1), "Test %u: Got unexpected tan %.8e, expected %.8e.\n", i, t, t_data[i].t); } for (i = 0; i < ARRAY_SIZE(l_data); ++i) { - l = D2D1Vec3Length(l_data[i].x, l_data[i].y, l_data[i].z); + l = pD2D1Vec3Length(l_data[i].x, l_data[i].y, l_data[i].z); ok(compare_float(l, l_data[i].l, 0), "Test %u: Got unexpected length %.8e, expected %.8e.\n", i, l, l_data[i].l); } @@ -9611,10 +9620,14 @@ static void test_math(void) START_TEST(d2d1) { + HMODULE d2d1_dll = GetModuleHandleA("d2d1.dll"); unsigned int argc, i; char **argv; - pD2D1CreateDevice = (void *)GetProcAddress(GetModuleHandleA("d2d1.dll"), "D2D1CreateDevice"); + pD2D1CreateDevice = (void *)GetProcAddress(d2d1_dll, "D2D1CreateDevice"); + pD2D1SinCos = (void *)GetProcAddress(d2d1_dll, "D2D1SinCos"); + pD2D1Tan = (void *)GetProcAddress(d2d1_dll, "D2D1Tan"); + pD2D1Vec3Length = (void *)GetProcAddress(d2d1_dll, "D2D1Vec3Length"); use_mt = !getenv("WINETEST_NO_MT_D3D");

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
48
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 January 2021