Henri Verbeet : ddraw: Use wined3d_rendertarget_view_create_from_sub_resource() in ddraw_surface_get_rendertarget_view().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 6037179f6b48a9becdc9e8328ee3b4cc45a8f8eb
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6037179f6b48a9becdc9e8328e...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Wed Feb  3 22:22:58 2016 +0100

ddraw: Use wined3d_rendertarget_view_create_from_sub_resource() in ddraw_surface_get_rendertarget_view().

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

---

 dlls/ddraw/surface.c      |  4 ++--
 dlls/wined3d/view.c       | 15 ---------------
 dlls/wined3d/wined3d.spec |  1 -
 include/wine/wined3d.h    |  2 --
 4 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index 71b424d..923a935 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -6324,8 +6324,8 @@ struct wined3d_rendertarget_view *ddraw_surface_get_rendertarget_view(struct ddr
     if (surface->wined3d_rtv)
         return surface->wined3d_rtv;
 
-    if (FAILED(hr = wined3d_rendertarget_view_create_from_surface(surface->wined3d_surface,
-            surface, &ddraw_view_wined3d_parent_ops, &surface->wined3d_rtv)))
+    if (FAILED(hr = wined3d_rendertarget_view_create_from_sub_resource(surface->wined3d_texture,
+            surface->sub_resource_idx, surface, &ddraw_view_wined3d_parent_ops, &surface->wined3d_rtv)))
     {
         ERR("Failed to create rendertarget view, hr %#x.\n", hr);
         return NULL;
diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c
index 5f046fa..8d4f7fd 100644
--- a/dlls/wined3d/view.c
+++ b/dlls/wined3d/view.c
@@ -145,21 +145,6 @@ HRESULT CDECL wined3d_rendertarget_view_create(const struct wined3d_rendertarget
     return WINED3D_OK;
 }
 
-HRESULT CDECL wined3d_rendertarget_view_create_from_surface(struct wined3d_surface *surface,
-        void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_rendertarget_view **view)
-{
-    struct wined3d_rendertarget_view_desc desc;
-
-    TRACE("surface %p, parent %p, parent_ops %p, view %p.\n", surface, parent, parent_ops, view);
-
-    desc.format_id = surface->resource.format->id;
-    desc.u.texture.level_idx = surface->texture_level;
-    desc.u.texture.layer_idx = surface->texture_layer;
-    desc.u.texture.layer_count = 1;
-
-    return wined3d_rendertarget_view_create(&desc, &surface->container->resource, parent, parent_ops, view);
-}
-
 HRESULT CDECL wined3d_rendertarget_view_create_from_sub_resource(struct wined3d_texture *texture,
         unsigned int sub_resource_idx, void *parent, const struct wined3d_parent_ops *parent_ops,
         struct wined3d_rendertarget_view **view)
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index 6f930ef..ba25f9d 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -188,7 +188,6 @@
 @ cdecl wined3d_resource_unmap(ptr long)
 
 @ cdecl wined3d_rendertarget_view_create(ptr ptr ptr ptr ptr)
-@ cdecl wined3d_rendertarget_view_create_from_surface(ptr ptr ptr ptr)
 @ cdecl wined3d_rendertarget_view_create_from_sub_resource(ptr long ptr ptr ptr)
 @ cdecl wined3d_rendertarget_view_decref(ptr)
 @ cdecl wined3d_rendertarget_view_get_parent(ptr)
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index f29f4ff..1e91397 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2430,8 +2430,6 @@ HRESULT __cdecl wined3d_resource_unmap(struct wined3d_resource *resource, unsign
 HRESULT __cdecl wined3d_rendertarget_view_create(const struct wined3d_rendertarget_view_desc *desc,
         struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops,
         struct wined3d_rendertarget_view **view);
-HRESULT __cdecl wined3d_rendertarget_view_create_from_surface(struct wined3d_surface *surface,
-        void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_rendertarget_view **view);
 HRESULT __cdecl wined3d_rendertarget_view_create_from_sub_resource(struct wined3d_texture *texture,
         unsigned int sub_resource_idx, void *parent, const struct wined3d_parent_ops *parent_ops,
         struct wined3d_rendertarget_view **view);