commit 78e4a096a3af4ef000ac5251b39716066980340a
author Ričardas Barkauskas <miegalius@gmail.com> Sun Oct 24 22:39:31 2010 +0300
committer Alexandre Julliard <julliard@winehq.org> Mon Oct 25 15:31:12 2010 +0200
tree b43b81eadb71bb4d19628f34adc3da7540752522
parent ff659522f6d16c46d61b3cba0564ced8e65f5aa6

ddraw: Surfaces with DDSCAPS_3DDEVICE and DDSCAPS_ZBUFFER can't be render targets.

dlls/ddraw/surface.c

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 @@
         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;
     }

dlls/ddraw/tests/d3d.c

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 @@
     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);