diff --git a/patches/ddraw-Rendering_Targets/0001-ddraw-Create-rendering-targets-in-video-memory-if-po.patch b/patches/ddraw-Rendering_Targets/0001-ddraw-Create-rendering-targets-in-video-memory-if-po.patch index 8f16a210..13ed51e6 100644 --- a/patches/ddraw-Rendering_Targets/0001-ddraw-Create-rendering-targets-in-video-memory-if-po.patch +++ b/patches/ddraw-Rendering_Targets/0001-ddraw-Create-rendering-targets-in-video-memory-if-po.patch @@ -1,11 +1,10 @@ -From b78cfe9c6453db477e0ba69b343e3ed128b345bd Mon Sep 17 00:00:00 2001 +From 1a21bd1a5584a1d2b54a8a6df9944d44a83b05d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Wed, 29 Jul 2015 17:09:50 +0200 Subject: [PATCH] ddraw: Create rendering targets in video memory if possible. Based on a patch by Henri Verbeet. -Signed-off-by: Paul Gofman --- dlls/ddraw/ddraw.c | 6 +++--- dlls/ddraw/ddraw_private.h | 3 ++- @@ -14,10 +13,10 @@ Signed-off-by: Paul Gofman 4 files changed, 56 insertions(+), 15 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c -index 2f94e325db..82bf315fe7 100644 +index 68e9286590..1141739e78 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c -@@ -4342,7 +4342,7 @@ static HRESULT WINAPI d3d7_CreateDevice(IDirect3D7 *iface, REFCLSID riid, +@@ -4296,7 +4296,7 @@ static HRESULT WINAPI d3d7_CreateDevice(IDirect3D7 *iface, REFCLSID riid, TRACE("iface %p, riid %s, surface %p, device %p.\n", iface, debugstr_guid(riid), surface, device); wined3d_mutex_lock(); @@ -26,7 +25,7 @@ index 2f94e325db..82bf315fe7 100644 { *device = &object->IDirect3DDevice7_iface; } -@@ -4371,7 +4371,7 @@ static HRESULT WINAPI d3d3_CreateDevice(IDirect3D3 *iface, REFCLSID riid, +@@ -4325,7 +4325,7 @@ static HRESULT WINAPI d3d3_CreateDevice(IDirect3D3 *iface, REFCLSID riid, return CLASS_E_NOAGGREGATION; wined3d_mutex_lock(); @@ -35,7 +34,7 @@ index 2f94e325db..82bf315fe7 100644 { *device = &device_impl->IDirect3DDevice3_iface; } -@@ -4397,7 +4397,7 @@ static HRESULT WINAPI d3d2_CreateDevice(IDirect3D2 *iface, REFCLSID riid, +@@ -4351,7 +4351,7 @@ static HRESULT WINAPI d3d2_CreateDevice(IDirect3D2 *iface, REFCLSID riid, iface, debugstr_guid(riid), surface, device); wined3d_mutex_lock(); @@ -45,10 +44,10 @@ index 2f94e325db..82bf315fe7 100644 *device = &device_impl->IDirect3DDevice2_iface; } diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h -index 19f21a8923..e2fe323b68 100644 +index 771b2a44d1..4bf0e46462 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h -@@ -304,6 +304,7 @@ struct d3d_device +@@ -307,6 +307,7 @@ struct d3d_device IUnknown IUnknown_inner; LONG ref; UINT version; @@ -56,8 +55,8 @@ index 19f21a8923..e2fe323b68 100644 IUnknown *outer_unknown; struct wined3d_device *wined3d_device; -@@ -350,7 +351,7 @@ struct d3d_device - BOOL recording; +@@ -354,7 +355,7 @@ struct d3d_device + struct wined3d_stateblock *recording; }; -HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUnknown *rt_iface, @@ -66,10 +65,10 @@ index 19f21a8923..e2fe323b68 100644 enum wined3d_depth_buffer_type d3d_device_update_depth_stencil(struct d3d_device *device) DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c -index 054e2dccc9..0170639de8 100644 +index 43e5d0aa92..5d18a129f7 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c -@@ -1850,7 +1850,7 @@ static HRESULT d3d_device7_SetRenderTarget(IDirect3DDevice7 *iface, +@@ -1854,7 +1854,7 @@ static HRESULT d3d_device7_SetRenderTarget(IDirect3DDevice7 *iface, return DDERR_INVALIDCAPS; } @@ -78,7 +77,7 @@ index 054e2dccc9..0170639de8 100644 { WARN("Surface %p is not in video memory.\n", target_impl); wined3d_mutex_unlock(); -@@ -1926,7 +1926,7 @@ static HRESULT WINAPI d3d_device3_SetRenderTarget(IDirect3DDevice3 *iface, +@@ -1930,7 +1930,7 @@ static HRESULT WINAPI d3d_device3_SetRenderTarget(IDirect3DDevice3 *iface, return DDERR_INVALIDPIXELFORMAT; } @@ -87,7 +86,7 @@ index 054e2dccc9..0170639de8 100644 { WARN("Surface %p is not in video memory.\n", target_impl); IDirectDrawSurface4_AddRef(target); -@@ -1975,7 +1975,7 @@ static HRESULT WINAPI d3d_device2_SetRenderTarget(IDirect3DDevice2 *iface, +@@ -1979,7 +1979,7 @@ static HRESULT WINAPI d3d_device2_SetRenderTarget(IDirect3DDevice2 *iface, return DDERR_INVALIDPIXELFORMAT; } @@ -96,7 +95,7 @@ index 054e2dccc9..0170639de8 100644 { WARN("Surface %p is not in video memory.\n", target_impl); IDirectDrawSurface_AddRef(target); -@@ -6976,7 +6976,7 @@ enum wined3d_depth_buffer_type d3d_device_update_depth_stencil(struct d3d_device +@@ -6933,7 +6933,7 @@ enum wined3d_depth_buffer_type d3d_device_update_depth_stencil(struct d3d_device return WINED3D_ZB_TRUE; } @@ -105,7 +104,7 @@ index 054e2dccc9..0170639de8 100644 struct ddraw_surface *target, IUnknown *rt_iface, UINT version, IUnknown *outer_unknown) { static const D3DMATRIX ident = -@@ -6999,6 +6999,7 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, +@@ -6956,6 +6956,7 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, device->IUnknown_inner.lpVtbl = &d3d_device_inner_vtbl; device->ref = 1; device->version = version; @@ -113,7 +112,7 @@ index 054e2dccc9..0170639de8 100644 if (outer_unknown) device->outer_unknown = outer_unknown; -@@ -7049,14 +7050,18 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, +@@ -7009,14 +7010,18 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, return D3D_OK; } @@ -135,7 +134,7 @@ index 054e2dccc9..0170639de8 100644 if (!(target->surface_desc.ddsCaps.dwCaps & DDSCAPS_3DDEVICE) || (target->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER)) -@@ -7079,7 +7084,7 @@ HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUn +@@ -7039,7 +7044,7 @@ HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUn return DDERR_OUTOFMEMORY; } @@ -144,7 +143,7 @@ index 054e2dccc9..0170639de8 100644 { WARN("Surface %p is not in video memory.\n", target); return D3DERR_SURFACENOTINVIDMEM; -@@ -7097,7 +7102,7 @@ HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUn +@@ -7057,7 +7062,7 @@ HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUn return DDERR_OUTOFMEMORY; } @@ -154,10 +153,10 @@ index 054e2dccc9..0170639de8 100644 WARN("Failed to initialize device, hr %#x.\n", hr); heap_free(object); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c -index cac05c39dc..1fc78eeab7 100644 +index 66e5a9e616..31ccce29b8 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c -@@ -226,7 +226,7 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface, +@@ -223,7 +223,7 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface, { HRESULT hr; @@ -166,7 +165,7 @@ index cac05c39dc..1fc78eeab7 100644 1, &This->device1, (IUnknown *)&This->IDirectDrawSurface_iface))) { This->device1 = NULL; -@@ -6175,7 +6175,42 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ +@@ -6197,7 +6197,42 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ if (desc->ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) { @@ -211,5 +210,5 @@ index cac05c39dc..1fc78eeab7 100644 } else -- -2.20.1 +2.21.0