From: Henri Verbeet <hverbeet@codeweavers.com>
Date: Tue, 8 Mar 2011 18:41:08 +0000 (+0100)
Subject: d3d9: Surfaces always have resource type WINED3DRTYPE_SURFACE.
X-Git-Tag: wine-1.3.16~371
X-Git-Url: http://git.etersoft.ru/projects/?a=commitdiff_plain;h=ab8a9f27f925e47cb39959ad4a3e84c7752d26f0;p=wine%2Feterwine.git

d3d9: Surfaces always have resource type WINED3DRTYPE_SURFACE.
---

diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index 1dd6895d07..e008b31b80 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");