ddraw: Force surfaces without memory flags to video memory on creation.

Also removes now redundant setting of vidmem flag on rendertargets, prevents adding vidmem flag when sysmem flag is present. Fixes missing textures in Forsaken.

ddraw: Force surfaces without memory flags to video memory on creation.
59fc5a75 · Alexander Dorofeyev · Alexandre Julliard · 3a1e2a30 · 59fc5a75 · 59fc5a75
Commit 59fc5a75 authored Jul 15, 2008 by Alexander Dorofeyev Committed by Alexandre Julliard Jul 17, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 13 deletions

ddraw.c dlls/ddraw/ddraw.c +7 -7

texture.c dlls/ddraw/texture.c +0 -6

No files found.
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -1917,6 +1917,12 @@ IDirectDrawImpl_CreateNewSurface(IDirectDrawImpl *This,
        }
    }

+    if (!(pDDSD->ddsCaps.dwCaps & (DDSCAPS_VIDEOMEMORY | DDSCAPS_SYSTEMMEMORY)) &&
+        !((pDDSD->ddsCaps.dwCaps & DDSCAPS_TEXTURE) && (pDDSD->ddsCaps.dwCaps2 & DDSCAPS2_TEXTUREMANAGE)) )
+    {
+        /* Tests show surfaces without memory flags get these flags added right after creation. */
+        pDDSD->ddsCaps.dwCaps |= DDSCAPS_LOCALVIDMEM | DDSCAPS_VIDEOMEMORY;
+    }
    /* Get the correct wined3d usage */
    if (pDDSD->ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE |
                                 DDSCAPS_BACKBUFFER     |
@@ -1924,8 +1930,7 @@ IDirectDrawImpl_CreateNewSurface(IDirectDrawImpl *This,
    {
        Usage |= WINED3DUSAGE_RENDERTARGET;

-        pDDSD->ddsCaps.dwCaps |= DDSCAPS_VIDEOMEMORY |
-                                 DDSCAPS_VISIBLE;
+        pDDSD->ddsCaps.dwCaps |= DDSCAPS_VISIBLE;
    }
    if (pDDSD->ddsCaps.dwCaps & (DDSCAPS_OVERLAY))
    {
@@ -2345,11 +2350,6 @@ IDirectDrawImpl_CreateSurface(IDirectDraw7 *iface,
        /* DVIDEO.DLL does forget the DDSD_CAPS flag ... *sigh* */
        DDSD->dwFlags |= DDSD_CAPS;
    }
-    if (DDSD->ddsCaps.dwCaps == 0)
-    {
-        /* This has been checked on real Windows */
-        DDSD->ddsCaps.dwCaps = DDSCAPS_LOCALVIDMEM | DDSCAPS_VIDEOMEMORY;
-    }

    if (DDSD->ddsCaps.dwCaps & DDSCAPS_ALLOCONLOAD)
    {

--- a/dlls/ddraw/texture.c
+++ b/dlls/ddraw/texture.c
@@ -324,12 +324,6 @@ IDirect3DTextureImpl_Load(IDirect3DTexture2 *iface,

        TRACE(" copying surface %p to surface %p (mipmap level %d)\n", src_ptr, This, src_ptr->mipmap_level);

-        if ( This->surface_desc.ddsCaps.dwCaps & DDSCAPS_ALLOCONLOAD )
-            /* If the surface is not allocated and its location is not yet specified,
-              force it to video memory */ 
-            if ( !(This->surface_desc.ddsCaps.dwCaps & (DDSCAPS_SYSTEMMEMORY|DDSCAPS_VIDEOMEMORY)) )
-                This->surface_desc.ddsCaps.dwCaps |= DDSCAPS_VIDEOMEMORY;
-
        /* Suppress the ALLOCONLOAD flag */
        This->surface_desc.ddsCaps.dwCaps &= ~DDSCAPS_ALLOCONLOAD;