From: Riccardo Bortolato <rikyz619@gmail.com>
Subject: [PATCH 10/12] wined3d: remove wined3d_surface_preload
Message-Id: <1442996856-32611-10-git-send-email-rikyz619@gmail.com>
Date: Wed, 23 Sep 2015 10:27:34 +0200

---
 dlls/d3d9/surface.c       |  6 +-----
 dlls/ddraw/device.c       |  6 +-----
 dlls/wined3d/surface.c    | 13 -------------
 dlls/wined3d/wined3d.spec |  1 -
 include/wine/wined3d.h    |  1 -
 5 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c
index 1c44c96..e7daca1 100644
--- a/dlls/d3d9/surface.c
+++ b/dlls/d3d9/surface.c
@@ -180,15 +180,11 @@ 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 wined3d_resource *sub_resource;
-    struct wined3d_surface *wined3d_surface;
 
     TRACE("iface %p.\n", iface);
 
     wined3d_mutex_lock();
-    sub_resource = wined3d_texture_get_sub_resource(surface->wined3d_texture, surface->sub_resource_idx);
-    wined3d_surface = wined3d_surface_from_resource(sub_resource);
-    wined3d_surface_preload(wined3d_surface);
+    wined3d_texture_preload(surface->wined3d_texture);
     wined3d_mutex_unlock();
 }
 
diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c
index 45fa570..f209d0b 100644
--- a/dlls/ddraw/device.c
+++ b/dlls/ddraw/device.c
@@ -5618,8 +5618,6 @@ static HRESULT WINAPI d3d_device7_EndStateBlock_FPUPreserve(IDirect3DDevice7 *if
 static HRESULT d3d_device7_PreLoad(IDirect3DDevice7 *iface, IDirectDrawSurface7 *texture)
 {
     struct ddraw_surface *surface = unsafe_impl_from_IDirectDrawSurface7(texture);
-    struct wined3d_resource *sub_resource;
-    struct wined3d_surface *wined3d_surface;
 
     TRACE("iface %p, texture %p.\n", iface, texture);
 
@@ -5627,9 +5625,7 @@ static HRESULT d3d_device7_PreLoad(IDirect3DDevice7 *iface, IDirectDrawSurface7
         return DDERR_INVALIDPARAMS;
 
     wined3d_mutex_lock();
-    sub_resource = wined3d_texture_get_sub_resource(surface->wined3d_texture, surface->sub_resource_idx);
-    wined3d_surface = wined3d_surface_from_resource(sub_resource);
-    wined3d_surface_preload(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 3399b48..5f00003 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -1863,19 +1863,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 da2f80e..2effe3b 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -232,7 +232,6 @@
 @ cdecl wined3d_surface_getdc(ptr ptr)
 @ cdecl wined3d_surface_incref(ptr)
 @ cdecl wined3d_surface_is_lost(ptr)
-@ 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 8cef52f..107b702 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2489,7 +2489,6 @@ struct wined3d_resource * __cdecl wined3d_surface_get_resource(struct wined3d_su
 HRESULT __cdecl wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc);
 ULONG __cdecl wined3d_surface_incref(struct wined3d_surface *surface);
 HRESULT __cdecl wined3d_surface_is_lost(const struct wined3d_surface *surface);
-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