From: Riccardo Bortolato Subject: [PATCH 2/2] wined3d: replace wined3d_surface_preload with wined3d_texture_preload Message-Id: <1441884698-8504-2-git-send-email-rikyz619@gmail.com> Date: Thu, 10 Sep 2015 13:31:38 +0200 --- dlls/d3d9/surface.c | 7 ++++++- dlls/ddraw/device.c | 2 +- dlls/wined3d/surface.c | 13 ------------- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 1 - 5 files changed, 7 insertions(+), 17 deletions(-) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index e5eb11f..69ebbbd 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -172,11 +172,16 @@ static DWORD WINAPI d3d9_surface_GetPriority(IDirect3DSurface9 *iface) static void WINAPI d3d9_surface_PreLoad(IDirect3DSurface9 *iface) { struct d3d9_surface *surface = impl_from_IDirect3DSurface9(iface); + struct d3d9_texture *texture = surface->texture; TRACE("iface %p.\n", iface); + /* Standalone surfaces can't be in D3DPOOL_MANAGED */ + if (!texture) + return; + wined3d_mutex_lock(); - wined3d_surface_preload(surface->wined3d_surface); + wined3d_texture_preload(texture->wined3d_texture); wined3d_mutex_unlock(); } diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 408eb24..f3736db 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5625,7 +5625,7 @@ static HRESULT d3d_device7_PreLoad(IDirect3DDevice7 *iface, IDirectDrawSurface7 return DDERR_INVALIDPARAMS; wined3d_mutex_lock(); - wined3d_surface_preload(surface->wined3d_surface); + wined3d_texture_preload(surface->wined3d_texture); wined3d_mutex_unlock(); return D3D_OK; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f303d90..e23b887 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1856,19 +1856,6 @@ ULONG CDECL wined3d_surface_decref(struct wined3d_surface *surface) return wined3d_texture_decref(surface->container); } -void CDECL wined3d_surface_preload(struct wined3d_surface *surface) -{ - TRACE("surface %p.\n", surface); - - if (!surface->resource.device->d3d_initialized) - { - ERR("D3D not initialized.\n"); - return; - } - - wined3d_texture_preload(surface->container); -} - void * CDECL wined3d_surface_get_parent(const struct wined3d_surface *surface) { TRACE("surface %p.\n", surface); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 6f770a9..335080e 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -235,7 +235,6 @@ @ cdecl wined3d_surface_incref(ptr) @ cdecl wined3d_surface_is_lost(ptr) @ cdecl wined3d_surface_map(ptr ptr ptr long) -@ cdecl wined3d_surface_preload(ptr) @ cdecl wined3d_surface_releasedc(ptr ptr) @ cdecl wined3d_surface_restore(ptr) @ cdecl wined3d_surface_set_overlay_position(ptr long long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 464a08c..583bac2 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2498,7 +2498,6 @@ ULONG __cdecl wined3d_surface_incref(struct wined3d_surface *surface); HRESULT __cdecl wined3d_surface_is_lost(const struct wined3d_surface *surface); HRESULT __cdecl wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_desc *map_desc, const RECT *rect, DWORD flags); -void __cdecl wined3d_surface_preload(struct wined3d_surface *surface); HRESULT __cdecl wined3d_surface_releasedc(struct wined3d_surface *surface, HDC dc); HRESULT __cdecl wined3d_surface_restore(struct wined3d_surface *surface); HRESULT __cdecl wined3d_surface_set_overlay_position(struct wined3d_surface *surface, LONG x, LONG y); -- 1.9.1