ddraw: Do not request 3D-usages for DDRAW_NO3D surfaces.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ddraw: Do not request 3D-usages for DDRAW_NO3D surfaces.
8ac639d2 · Henri Verbeet · Alexandre Julliard · a4700455 · 8ac639d2
Commit 8ac639d2 authored Sep 26, 2018 by Henri Verbeet Committed by Alexandre Julliard Sep 26, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 6 deletions

surface.c dlls/ddraw/surface.c +9 -6

No files found.
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -6152,12 +6152,15 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_
    }
    else
    {
-        if (desc->ddsCaps.dwCaps & DDSCAPS_TEXTURE)
+        if (!(ddraw->flags & DDRAW_NO3D))
-            wined3d_desc.usage |= WINED3DUSAGE_TEXTURE;
+        {
-        if (desc->ddsCaps.dwCaps & DDSCAPS_ZBUFFER)
+            if (desc->ddsCaps.dwCaps & DDSCAPS_TEXTURE)
-            wined3d_desc.usage |= WINED3DUSAGE_DEPTHSTENCIL;
+                wined3d_desc.usage |= WINED3DUSAGE_TEXTURE;
-        else if (desc->ddsCaps.dwCaps & DDSCAPS_3DDEVICE)
+            if (desc->ddsCaps.dwCaps & DDSCAPS_ZBUFFER)
-            wined3d_desc.usage |= WINED3DUSAGE_RENDERTARGET;
+                wined3d_desc.usage |= WINED3DUSAGE_DEPTHSTENCIL;
+            else if (desc->ddsCaps.dwCaps & DDSCAPS_3DDEVICE)
+                wined3d_desc.usage |= WINED3DUSAGE_RENDERTARGET;
+        }
        if (desc->ddsCaps.dwCaps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE))
        {