d3d11: Set WINED3D_RESOURCE_ACCESS_MAP on 2D textures.

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

d3d11: Set WINED3D_RESOURCE_ACCESS_MAP on 2D textures.
469dd878 · Henri Verbeet · Alexandre Julliard · 5ceaf934 · 469dd878 · 469dd878
Commit 469dd878 authored Feb 13, 2018 by Henri Verbeet Committed by Alexandre Julliard Feb 13, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

texture.c dlls/d3d11/texture.c +1 -1

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

No files found.
--- a/dlls/d3d11/texture.c
+++ b/dlls/d3d11/texture.c
@@ -517,7 +517,7 @@ HRESULT d3d_texture2d_create(struct d3d_device *device, const D3D11_TEXTURE2D_DE
    wined3d_desc.multisample_type = desc->SampleDesc.Count > 1 ? desc->SampleDesc.Count : WINED3D_MULTISAMPLE_NONE;
    wined3d_desc.multisample_quality = desc->SampleDesc.Quality;
    wined3d_desc.usage = wined3d_usage_from_d3d11(desc->BindFlags, desc->Usage);
-    wined3d_desc.access = WINED3D_RESOURCE_ACCESS_GPU;
+    wined3d_desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP;
    wined3d_desc.width = desc->Width;
    wined3d_desc.height = desc->Height;
    wined3d_desc.depth = 1;

--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -1901,8 +1901,7 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour
    if (!(resource->access & WINED3D_RESOURCE_ACCESS_MAP))
    {
        WARN("Trying to map unmappable texture.\n");
-        if (resource->type != WINED3D_RTYPE_TEXTURE_2D)
-            return WINED3DERR_INVALIDCALL;
+        return WINED3DERR_INVALIDCALL;
    }

    if (texture->flags & WINED3D_TEXTURE_DC_IN_USE)