Skip to content

W
wine-winehq
Commit 96936834 authored by Stefan Dösinger's avatar Stefan Dösinger Committed by Alexandre Julliard
Browse files
Options

ddraw/tests: Test d3d2 and 3 drawing with non-standard viewports.

Signed-off-by: 's avatarStefan Dösinger <stefandoesinger@gmx.at> Signed-off-by: 's avatarHenri Verbeet <hverbeet@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent ce7fa156
Hide whitespace changes
Inline Side-by-side
Showing with 121 additions and 1 deletion
dlls/ddraw/tests/ddraw2.c
View file @ 96936834
...@@ -10507,11 +10507,14 @@ struct transform_output ...@@ -10507,11 +10507,14 @@ struct transform_output
static void test_transform_vertices(void) static void test_transform_vertices(void)
{ {
IDirect3DDevice2 *device; IDirect3DDevice2 *device;
IDirectDrawSurface *rt;
IDirectDraw2 *ddraw; IDirectDraw2 *ddraw;
ULONG refcount; ULONG refcount;
HWND window; HWND window;
HRESULT hr; HRESULT hr;
D3DCOLOR color;
IDirect3DViewport2 *viewport; IDirect3DViewport2 *viewport;
IDirect3DMaterial2 *background;
static struct transform_input position_tests[] = static struct transform_input position_tests[] =
{ {
{ 0.0f, 0.0f, 0.0f, 0.0f, 1, 2, 3, 4, 5}, { 0.0f, 0.0f, 0.0f, 0.0f, 1, 2, 3, 4, 5},
...@@ -10566,6 +10569,14 @@ static void test_transform_vertices(void) ...@@ -10566,6 +10569,14 @@ static void test_transform_vertices(void)
0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f,
0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f,
}; };
static D3DLVERTEX quad[] =
{
{{-0.75f},{-0.5f }, {0.0f}, 0, {0xffff0000}},
{{-0.75f},{ 0.25f}, {0.0f}, 0, {0xffff0000}},
{{ 0.5f}, {-0.5f }, {0.0f}, 0, {0xffff0000}},
{{ 0.5f}, { 0.25f}, {0.0f}, 0, {0xffff0000}},
};
static D3DRECT clear_rect = {{0}, {0}, {640}, {480}};
for (i = 0; i < ARRAY_SIZE(out); ++i) for (i = 0; i < ARRAY_SIZE(out); ++i)
...@@ -10585,6 +10596,8 @@ static void test_transform_vertices(void) ...@@ -10585,6 +10596,8 @@ static void test_transform_vertices(void)
DestroyWindow(window); DestroyWindow(window);
return; return;
} }
hr = IDirect3DDevice2_GetRenderTarget(device, &rt);
ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr);
viewport = create_viewport(device, 0, 0, 256, 256); viewport = create_viewport(device, 0, 0, 256, 256);
hr = IDirect3DViewport2_SetViewport(viewport, &vp_data); hr = IDirect3DViewport2_SetViewport(viewport, &vp_data);
...@@ -10942,7 +10955,54 @@ static void test_transform_vertices(void) ...@@ -10942,7 +10955,54 @@ static void test_transform_vertices(void)
ok(SUCCEEDED(hr), "Failed to transform vertices, hr %#x.\n", hr); ok(SUCCEEDED(hr), "Failed to transform vertices, hr %#x.\n", hr);
ok(offscreen == ~0U, "Offscreen is %x.\n", offscreen); ok(offscreen == ~0U, "Offscreen is %x.\n", offscreen);
/* Test how vertices are transformed during draws. */
vp_data.dwX = 20;
vp_data.dwY = 20;
vp_data.dwWidth = 200;
vp_data.dwHeight = 400;
vp_data.dvScaleX = 20.0f;
vp_data.dvScaleY = 50.0f;
vp_data.dvMinZ = 0.0f;
vp_data.dvMaxZ = 1.0f;
hr = IDirect3DViewport2_SetViewport(viewport, &vp_data);
ok(SUCCEEDED(hr), "Failed to set viewport, hr %#x.\n", hr);
hr = IDirect3DDevice2_SetCurrentViewport(device, viewport);
ok(SUCCEEDED(hr), "Failed to activate the viewport, hr %#x.\n", hr);
ok(SUCCEEDED(hr), "Failed to clear the render target, hr %#x.\n", hr);
background = create_diffuse_material(device, 0.0f, 0.0f, 1.0f, 0.0f);
viewport_set_background(device, viewport, background);
hr = IDirect3DViewport2_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET);
ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr);
hr = IDirect3DDevice2_BeginScene(device);
ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr);
hr = IDirect3DDevice2_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DVT_LVERTEX, quad, 4, 0);
ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr);
hr = IDirect3DDevice2_EndScene(device);
ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr);
color = get_surface_color(rt, 128, 143);
ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color);
color = get_surface_color(rt, 132, 143);
ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color);
color = get_surface_color(rt, 128, 147);
ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color);
color = get_surface_color(rt, 132, 147);
todo_wine ok(compare_color(color, 0x00ff0000, 1), "Got unexpected color 0x%08x.\n", color);
color = get_surface_color(rt, 177, 217);
ok(compare_color(color, 0x00ff0000, 1), "Got unexpected color 0x%08x.\n", color);
color = get_surface_color(rt, 181, 217);
ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color);
color = get_surface_color(rt, 177, 221);
todo_wine ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color);
color = get_surface_color(rt, 181, 221);
ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color);
IDirectDrawSurface_Release(rt);
destroy_viewport(device, viewport); destroy_viewport(device, viewport);
IDirect3DMaterial2_Release(background);
refcount = IDirect3DDevice_Release(device); refcount = IDirect3DDevice_Release(device);
ok(!refcount, "Device has %u references left.\n", refcount); ok(!refcount, "Device has %u references left.\n", refcount);
IDirectDraw2_Release(ddraw); IDirectDraw2_Release(ddraw);
......
dlls/ddraw/tests/ddraw4.c
View file @ 96936834
...@@ -11809,9 +11809,11 @@ struct transform_output ...@@ -11809,9 +11809,11 @@ struct transform_output
static void test_transform_vertices(void) static void test_transform_vertices(void)
{ {
IDirect3DDevice3 *device; IDirect3DDevice3 *device;
IDirectDrawSurface4 *rt;
ULONG refcount; ULONG refcount;
HWND window; HWND window;
HRESULT hr; HRESULT hr;
D3DCOLOR color;
IDirect3DViewport3 *viewport; IDirect3DViewport3 *viewport;
static struct transform_input position_tests[] = static struct transform_input position_tests[] =
{ {
...@@ -11867,7 +11869,19 @@ static void test_transform_vertices(void) ...@@ -11867,7 +11869,19 @@ static void test_transform_vertices(void)
0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f,
0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f,
}; };
static struct
{
struct vec3 position;
DWORD color;
}
quad[] =
{
{{-0.75f, -0.5f , 0.0f}, 0xffff0000},
{{-0.75f, 0.25f, 0.0f}, 0xffff0000},
{{ 0.5f, -0.5f , 0.0f}, 0xffff0000},
{{ 0.5f, 0.25f, 0.0f}, 0xffff0000},
};
static D3DRECT clear_rect = {{0}, {0}, {640}, {480}};
for (i = 0; i < ARRAY_SIZE(out); ++i) for (i = 0; i < ARRAY_SIZE(out); ++i)
{ {
...@@ -11883,6 +11897,8 @@ static void test_transform_vertices(void) ...@@ -11883,6 +11897,8 @@ static void test_transform_vertices(void)
DestroyWindow(window); DestroyWindow(window);
return; return;
} }
hr = IDirect3DDevice3_GetRenderTarget(device, &rt);
ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr);
viewport = create_viewport(device, 0, 0, 256, 256); viewport = create_viewport(device, 0, 0, 256, 256);
hr = IDirect3DViewport2_SetViewport(viewport, &vp_data); hr = IDirect3DViewport2_SetViewport(viewport, &vp_data);
...@@ -12240,7 +12256,51 @@ static void test_transform_vertices(void) ...@@ -12240,7 +12256,51 @@ static void test_transform_vertices(void)
ok(SUCCEEDED(hr), "Failed to transform vertices, hr %#x.\n", hr); ok(SUCCEEDED(hr), "Failed to transform vertices, hr %#x.\n", hr);
ok(offscreen == ~0U, "Offscreen is %x.\n", offscreen); ok(offscreen == ~0U, "Offscreen is %x.\n", offscreen);
/* Test how vertices are transformed during draws. */
vp_data.dwX = 20;
vp_data.dwY = 20;
vp_data.dwWidth = 200;
vp_data.dwHeight = 400;
vp_data.dvScaleX = 20.0f;
vp_data.dvScaleY = 50.0f;
vp_data.dvMinZ = 0.0f;
vp_data.dvMaxZ = 1.0f;
hr = IDirect3DViewport3_SetViewport(viewport, &vp_data);
ok(SUCCEEDED(hr), "Failed to set viewport, hr %#x.\n", hr);
hr = IDirect3DDevice3_SetCurrentViewport(device, viewport);
ok(SUCCEEDED(hr), "Failed to activate the viewport, hr %#x.\n", hr);
hr = IDirect3DViewport3_Clear2(viewport, 1, &clear_rect, D3DCLEAR_TARGET, 0x000000ff, 0.0f, 0);
ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr);
hr = IDirect3DDevice3_BeginScene(device);
ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr);
hr = IDirect3DDevice3_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ | D3DFVF_DIFFUSE,
quad, 4, 0);
ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr);
hr = IDirect3DDevice3_EndScene(device);
ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr);
color = get_surface_color(rt, 128, 143);
ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color);
color = get_surface_color(rt, 132, 143);
ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color);
color = get_surface_color(rt, 128, 147);
ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color);
color = get_surface_color(rt, 132, 147);
ok(compare_color(color, 0x00ff0000, 1), "Got unexpected color 0x%08x.\n", color);
color = get_surface_color(rt, 177, 217);
ok(compare_color(color, 0x00ff0000, 1), "Got unexpected color 0x%08x.\n", color);
color = get_surface_color(rt, 181, 217);
ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color);
color = get_surface_color(rt, 177, 221);
ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color);
color = get_surface_color(rt, 181, 221);
ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color);
destroy_viewport(device, viewport); destroy_viewport(device, viewport);
IDirectDrawSurface4_Release(rt);
refcount = IDirect3DDevice3_Release(device); refcount = IDirect3DDevice3_Release(device);
ok(!refcount, "Device has %u references left.\n", refcount); ok(!refcount, "Device has %u references left.\n", refcount);
DestroyWindow(window); DestroyWindow(window);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment