Henri Verbeet : d3d9: Do not set WINED3D_TEXTURE_CREATE_MAPPABLE for swapchain textures.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 471715b946e9faa045c9755c95cae6b02ee3ba3e
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=471715b946e9faa045c9755c9...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Thu Nov  8 21:47:04 2018 +0330

d3d9: Do not set WINED3D_TEXTURE_CREATE_MAPPABLE for swapchain textures.

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

---

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

diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index d6faa97..0cf2049 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -4184,8 +4184,7 @@ static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_devic
         container_parent = &device->IDirect3DDevice9Ex_iface;
 
     if (FAILED(hr = wined3d_texture_create(device->wined3d_device, desc, 1, 1,
-            texture_flags | WINED3D_TEXTURE_CREATE_MAPPABLE, NULL, container_parent,
-            &d3d9_null_wined3d_parent_ops, texture)))
+            texture_flags, NULL, container_parent, &d3d9_null_wined3d_parent_ops, texture)))
     {
         WARN("Failed to create texture, hr %#x.\n", hr);
         return hr;
diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c
index e789107..56f7a43 100644
--- a/dlls/d3d9/tests/device.c
+++ b/dlls/d3d9/tests/device.c
@@ -12131,7 +12131,6 @@ todo_wine
     ok(SUCCEEDED(hr), "Failed to get backbuffer, hr %#x.\n", hr);
 
     hr = IDirect3DSurface9_LockRect(surface, &lockrect, NULL, D3DLOCK_DISCARD);
-todo_wine
     ok(SUCCEEDED(hr), "Failed to lock rect, hr %#x.\n", hr);
     hr = IDirect3DSurface9_UnlockRect(surface);
     ok(SUCCEEDED(hr), "Failed to unlock rect, hr %#x.\n", hr);