[PATCH 5/6] d3d8: Do not set WINED3D_TEXTURE_CREATE_MAPPABLE for swapchain textures.
Henri Verbeet
hverbeet at codeweavers.com
Thu Nov 8 11:59:06 CST 2018
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
---
dlls/d3d8/device.c | 5 ++---
dlls/d3d8/tests/device.c | 1 -
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c
index b05df7e2914..1d7e3dfc387 100644
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -3329,9 +3329,8 @@ static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_devic
TRACE("device_parent %p, container_parent %p, desc %p, texture flags %#x, texture %p.\n",
device_parent, container_parent, desc, texture_flags, texture);
- if (FAILED(hr = wined3d_texture_create(device->wined3d_device, desc, 1, 1,
- texture_flags | WINED3D_TEXTURE_CREATE_MAPPABLE, NULL, &device->IDirect3DDevice8_iface,
- &d3d8_null_wined3d_parent_ops, texture)))
+ if (FAILED(hr = wined3d_texture_create(device->wined3d_device, desc, 1, 1, texture_flags,
+ NULL, &device->IDirect3DDevice8_iface, &d3d8_null_wined3d_parent_ops, texture)))
{
WARN("Failed to create texture, hr %#x.\n", hr);
return hr;
diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c
index aec35ce22f0..8495342c0d3 100644
--- a/dlls/d3d8/tests/device.c
+++ b/dlls/d3d8/tests/device.c
@@ -8460,7 +8460,6 @@ todo_wine
ok(SUCCEEDED(hr), "Failed to get backbuffer, hr %#x.\n", hr);
hr = IDirect3DSurface8_LockRect(surface, &lockrect, NULL, D3DLOCK_READONLY);
-todo_wine
ok(SUCCEEDED(hr), "Failed to lock rect, hr %#x.\n", hr);
hr = IDirect3DSurface8_UnlockRect(surface);
ok(SUCCEEDED(hr), "Failed to unlock rect, hr %#x.\n", hr);
--
2.11.0
More information about the wine-devel
mailing list