[v9 03/11] ddraw: Check for mipmap sublevel through caps in ddraw_surface7_SetColorKey().

Riccardo Bortolato rikyz619 at gmail.com
Thu Nov 19 13:34:39 CST 2015


Signed-off-by: Riccardo Bortolato <rikyz619 at gmail.com>
---
 dlls/ddraw/surface.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index bb59e88..cad415c 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -4730,13 +4730,8 @@ static HRESULT WINAPI ddraw_surface7_SetColorKey(IDirectDrawSurface7 *iface, DWO
 
     TRACE("iface %p, flags %#x, color_key %p.\n", iface, flags, color_key);
 
-    wined3d_mutex_lock();
-    if (!surface->wined3d_texture)
-    {
-        wined3d_mutex_unlock();
+    if (surface->surface_desc.ddsCaps.dwCaps2 & DDSCAPS2_MIPMAPSUBLEVEL)
         return DDERR_NOTONMIPMAPSUBLEVEL;
-    }
-    wined3d_mutex_unlock();
 
     return ddraw_surface_set_color_key(surface, flags, color_key);
 }
-- 
1.9.1




More information about the wine-patches mailing list