Henri Verbeet : d3d9: Do not add map access indiscriminately in texture_init().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 949dbbd31f450178c90ea8267097a975b77c3219
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=949dbbd31f450178c90ea8267...

Author: Henri Verbeet 
Date:   Wed Nov 21 17:05:26 2018 +0330

d3d9: Do not add map access indiscriminately in texture_init().

Signed-off-by: Henri Verbeet 
Signed-off-by: Alexandre Julliard

---

dlls/d3d9/tests/device.c | 2 +-
 dlls/d3d9/texture.c      | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c
index 05e6d81..205a9cc 100644
--- a/dlls/d3d9/tests/device.c
+++ b/dlls/d3d9/tests/device.c
@@ -12877,7 +12877,7 @@ static void test_resource_access(void)
                 expected_hr = D3D_OK;
             else
                 expected_hr = D3DERR_INVALIDCALL;
-            todo_wine_if(expected_hr != D3D_OK)
+            todo_wine_if(expected_hr != D3D_OK && surface_types[i].type != SURFACE_2D)
                 ok(hr == expected_hr, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr);
             hr = IDirect3DSurface9_UnlockRect(surface);
             todo_wine_if(expected_hr != D3D_OK)
diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c
index e652416..de485ba 100644
--- a/dlls/d3d9/texture.c
+++ b/dlls/d3d9/texture.c
@@ -1314,8 +1314,7 @@ HRESULT texture_init(struct d3d9_texture *texture, struct d3d9_device *device,
     if (pool == D3DPOOL_SCRATCH)
         desc.usage |= WINED3DUSAGE_SCRATCH;
     desc.bind_flags = wined3d_bind_flags_from_d3d9_usage(usage) | WINED3D_BIND_SHADER_RESOURCE;
-    desc.access = wined3daccess_from_d3dpool(pool, usage)
-            | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W;
+    desc.access = wined3daccess_from_d3dpool(pool, usage);
     desc.width = width;
     desc.height = height;
     desc.depth = 1;