[4/4] ddraw: surfaces with DDSCAPS_3DDEVICE and DDSCAPS_ZBUFFER can't be render targets

[Ričardas Barkauskas]

Fixes 3Dmark2000 demo (no longer just black screen).

Ričardas Barkauskas
REalm
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.winehq.org/pipermail/wine-patches/attachments/20101024/d63fe8d8/attachment-0001.htm>
-------------- next part --------------
From 29f7b1af8e958d9b00088055ec08bca787d098f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ri=C4=8Dardas=20Barkauskas?= <miegalius at gmail.com>
Date: Sun, 24 Oct 2010 22:39:31 +0300
Subject: 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 2878a56..6a12cdf 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 f144543..87a368c 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);
-- 
1.7.1