=?UTF-8?Q?Stefan=20D=C3=B6singer=20?=: d3d9/tests: Avoid invalid framebuffer configrations in resz_test.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue May 19 09:53:21 CDT 2015
Module: wine
Branch: master
Commit: 87bf9c99b8dfd77d24c913bdd79401190722fdeb
URL: http://source.winehq.org/git/wine.git/?a=commit;h=87bf9c99b8dfd77d24c913bdd79401190722fdeb
Author: Stefan Dösinger <stefan at codeweavers.com>
Date: Sat May 16 15:29:12 2015 +0200
d3d9/tests: Avoid invalid framebuffer configrations in resz_test.
---
dlls/d3d9/tests/visual.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c
index 23050d6..cc5921e 100644
--- a/dlls/d3d9/tests/visual.c
+++ b/dlls/d3d9/tests/visual.c
@@ -15544,6 +15544,8 @@ static void resz_test(void)
hr = IDirect3DDevice9_SetRenderTarget(device, 0, original_rt);
ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr);
+ hr = IDirect3DDevice9_SetDepthStencilSurface(device, NULL);
+ ok(SUCCEEDED(hr), "Failed to set depth/stencil, hr %#x.\n", hr);
hr = IDirect3DDevice9_SetPixelShader(device, ps);
ok(SUCCEEDED(hr), "SetPixelShader failed, hr %#x.\n", hr);
@@ -15564,10 +15566,6 @@ static void resz_test(void)
hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL);
ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr);
- hr = IDirect3DDevice9_SetRenderTarget(device, 0, original_rt);
- ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr);
- hr = IDirect3DDevice9_SetDepthStencilSurface(device, NULL);
- ok(SUCCEEDED(hr), "Failed to set depth/stencil, hr %#x.\n", hr);
IDirect3DSurface9_Release(ds);
hr = IDirect3DDevice9_SetTexture(device, 0, NULL);
ok(SUCCEEDED(hr), "SetTexture failed, hr %#x.\n", hr);
@@ -15580,7 +15578,6 @@ static void resz_test(void)
IDirect3DSurface9_Release(rt);
cleanup_device(device);
-
ZeroMemory(&present_parameters, sizeof(present_parameters));
present_parameters.Windowed = TRUE;
present_parameters.hDeviceWindow = create_window();
@@ -15682,6 +15679,8 @@ static void resz_test(void)
hr = IDirect3DDevice9_SetRenderTarget(device, 0, readback);
ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr);
+ hr = IDirect3DDevice9_SetDepthStencilSurface(device, NULL);
+ ok(SUCCEEDED(hr), "Failed to set depth/stencil, hr %#x.\n", hr);
hr = IDirect3DDevice9_SetPixelShader(device, ps);
ok(SUCCEEDED(hr), "SetPixelShader failed, hr %#x.\n", hr);
@@ -15710,6 +15709,10 @@ static void resz_test(void)
ok(SUCCEEDED(hr), "SetPixelShader failed, hr %#x.\n", hr);
hr = IDirect3DDevice9_SetTexture(device, 0, NULL);
ok(SUCCEEDED(hr), "SetTexture failed, hr %#x.\n", hr);
+ hr = IDirect3DDevice9_SetDepthStencilSurface(device, ds);
+ ok(SUCCEEDED(hr), "Failed to set depth/stencil, hr %#x.\n", hr);
+ hr = IDirect3DDevice9_SetRenderTarget(device, 0, original_rt);
+ ok(SUCCEEDED(hr), "Failed to set depth/stencil, hr %#x.\n", hr);
hr = IDirect3DDevice9_BeginScene(device);
ok(SUCCEEDED(hr), "BeginScene failed, hr %#x.\n", hr);
More information about the wine-cvs
mailing list