wined3d: Reject managed/scratch textures with dynamic usage in texture_init().

For consistency with volumetexture_init(). Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wined3d: Reject managed/scratch textures with dynamic usage in texture_init().
4d4fc7ae · Henri Verbeet · Alexandre Julliard · 543a199d · 4d4fc7ae
Commit 4d4fc7ae authored Mar 15, 2018 by Henri Verbeet Committed by Alexandre Julliard Mar 15, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

texture.c dlls/wined3d/texture.c +8 -2

No files found.
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -2198,8 +2198,14 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3
        return WINED3DERR_INVALIDCALL;
    }

-    if (desc->usage & WINED3DUSAGE_DYNAMIC && wined3d_resource_access_is_managed(desc->access))
-        FIXME("Trying to create a managed texture with dynamic usage.\n");
+    if (desc->usage & WINED3DUSAGE_DYNAMIC && (wined3d_resource_access_is_managed(desc->access)
+            || desc->usage & WINED3DUSAGE_SCRATCH))
+    {
+        WARN("Attempted to create a dynamic texture with access %s and usage %s.\n",
+                wined3d_debug_resource_access(desc->access), debug_d3dusage(desc->usage));
+        return WINED3DERR_INVALIDCALL;
+    }
+
    if (!(desc->usage & (WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_DEPTHSTENCIL))
            && (flags & WINED3D_TEXTURE_CREATE_MAPPABLE))
        WARN("Creating a mappable texture that doesn't specify dynamic usage.\n");