From 78e4a096a3af4ef000ac5251b39716066980340a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ri=C4=8Dardas=20Barkauskas?= Date: Sun, 24 Oct 2010 22:39:31 +0300 Subject: [PATCH] ddraw: Surfaces with DDSCAPS_3DDEVICE and DDSCAPS_ZBUFFER can't be render targets. --- dlls/ddraw/surface.c | 2 +- dlls/ddraw/tests/d3d.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 2878a5640fe..6a12cdfd981 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -3517,7 +3517,7 @@ HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddr desc->ddsCaps.dwCaps |= DDSCAPS_VISIBLE; } - if (desc->ddsCaps.dwCaps & DDSCAPS_3DDEVICE) + if ((desc->ddsCaps.dwCaps & DDSCAPS_3DDEVICE) && !(desc->ddsCaps.dwCaps & DDSCAPS_ZBUFFER)) { usage |= WINED3DUSAGE_RENDERTARGET; } diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index f144543cf54..87a368cd815 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3181,7 +3181,7 @@ static void SetRenderTargetTest(void) ok(hr == DD_OK, "IDirect3DDevice7_GetRenderTarget failed, hr=0x%08x\n", hr); hr = IDirect3DDevice7_SetRenderTarget(lpD3DDevice, failrt, 0); - todo_wine ok(hr != D3D_OK, "IDirect3DDevice7_SetRenderTarget succeeded\n"); + ok(hr != D3D_OK, "IDirect3DDevice7_SetRenderTarget succeeded\n"); hr = IDirect3DDevice7_SetRenderTarget(lpD3DDevice, newrt, 0); ok(hr == D3D_OK, "IDirect3DDevice7_SetRenderTarget failed, hr=0x%08x\n", hr); -- 2.11.4.GIT