Henri Verbeet : d3d9: Surfaces always have resource type WINED3DRTYPE_SURFACE.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ab8a9f27f925e47cb39959ad4a3e84c7752d26f0
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ab8a9f27f925e47cb39959ad4a...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Tue Mar  8 19:41:08 2011 +0100

d3d9: Surfaces always have resource type WINED3DRTYPE_SURFACE.

---

 dlls/d3d9/device.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index 1dd6895..e008b31 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -1081,8 +1081,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_ColorFill(IDirect3DDevice9Ex *iface,
 
     /* This method is only allowed with surfaces that are render targets, or
      * offscreen plain surfaces in D3DPOOL_DEFAULT. */
-    if (!(desc.usage & WINED3DUSAGE_RENDERTARGET)
-            && (desc.pool != WINED3DPOOL_DEFAULT || desc.resource_type != WINED3DRTYPE_SURFACE))
+    if (!(desc.usage & WINED3DUSAGE_RENDERTARGET) && desc.pool != WINED3DPOOL_DEFAULT)
     {
         wined3d_mutex_unlock();
         WARN("Surface is not a render target, or not a stand-alone D3DPOOL_DEFAULT surface\n");