[PATCH 4/6] ddraw: Apply legacy clipspace to d3d2.
Stefan Dösinger
stefandoesinger at gmx.at
Sat Sep 3 14:42:30 CDT 2016
Signed-off-by: Stefan Dösinger <stefandoesinger at gmx.at>
---
dlls/ddraw/device.c | 6 +++---
dlls/ddraw/tests/ddraw2.c | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c
index c7a516e..ab94bed 100644
--- a/dlls/ddraw/device.c
+++ b/dlls/ddraw/device.c
@@ -3230,7 +3230,7 @@ static HRESULT WINAPI d3d_device2_SetTransform(IDirect3DDevice2 *iface,
TRACE("iface %p, state %#x, matrix %p.\n", iface, state, matrix);
- return IDirect3DDevice7_SetTransform(&device->IDirect3DDevice7_iface, state, matrix);
+ return IDirect3DDevice3_SetTransform(&device->IDirect3DDevice3_iface, state, matrix);
}
/*****************************************************************************
@@ -3334,7 +3334,7 @@ static HRESULT WINAPI d3d_device2_GetTransform(IDirect3DDevice2 *iface,
TRACE("iface %p, state %#x, matrix %p.\n", iface, state, matrix);
- return IDirect3DDevice7_GetTransform(&device->IDirect3DDevice7_iface, state, matrix);
+ return IDirect3DDevice3_GetTransform(&device->IDirect3DDevice3_iface, state, matrix);
}
/*****************************************************************************
@@ -3441,7 +3441,7 @@ static HRESULT WINAPI d3d_device2_MultiplyTransform(IDirect3DDevice2 *iface,
TRACE("iface %p, state %#x, matrix %p.\n", iface, state, matrix);
- return IDirect3DDevice7_MultiplyTransform(&device->IDirect3DDevice7_iface, state, matrix);
+ return IDirect3DDevice3_MultiplyTransform(&device->IDirect3DDevice3_iface, state, matrix);
}
/*****************************************************************************
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index f3ccfb1..4cd38d9 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -10894,7 +10894,7 @@ static void test_transform_vertices(void)
{143.0f, 118.0f, 1.0f, 1.0f}, {133.0f, 128.0f, -1.0f, 1.0f}, {133.0f, 128.0f, 0.0f, 1.0f}
};
- todo_wine ok(compare_vec4(&cmp[i], out[i].x, out[i].y, out[i].z, out[i].w, 4096),
+ ok(compare_vec4(&cmp[i], out[i].x, out[i].y, out[i].z, out[i].w, 4096),
"Vertex %u differs. Got %f %f %f %f.\n", i,
out[i].x, out[i].y, out[i].z, out[i].w);
}
@@ -11011,14 +11011,14 @@ static void test_transform_vertices(void)
color = get_surface_color(rt, 128, 147);
ok(compare_color(color, 0x000000ff, 1), "Got unexpected color %#x\n", color);
color = get_surface_color(rt, 132, 147);
- todo_wine ok(compare_color(color, 0x00ff0000, 1), "Got unexpected color %#x\n", color);
+ ok(compare_color(color, 0x00ff0000, 1), "Got unexpected color %#x\n", color);
color = get_surface_color(rt, 177, 217);
ok(compare_color(color, 0x00ff0000, 1), "Got unexpected color %#x\n", color);
color = get_surface_color(rt, 181, 217);
ok(compare_color(color, 0x000000ff, 1), "Got unexpected color %#x\n", color);
color = get_surface_color(rt, 177, 221);
- todo_wine ok(compare_color(color, 0x000000ff, 1), "Got unexpected color %#x\n", color);
+ ok(compare_color(color, 0x000000ff, 1), "Got unexpected color %#x\n", color);
color = get_surface_color(rt, 181, 221);
ok(compare_color(color, 0x000000ff, 1), "Got unexpected color %#x\n", color);
--
2.7.3
More information about the wine-patches
mailing list