Module: wine Branch: master Commit: 3e491662ba90f97d834dd4cddec1c46b5af49d18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e491662ba90f97d834dd4cdde...
Author: Riccardo Bortolato rikyz619@gmail.com Date: Wed Oct 28 14:02:10 2015 +0100
wined3d: Introduce wined3d_rendertarget_view_create_from_sub_resource().
Initial usage in d3d9.
Signed-off-by: Riccardo Bortolato rikyz619@gmail.com Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/d3d9/surface.c | 4 ++-- dlls/wined3d/view.c | 22 ++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 3 +++ 4 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 23bb43c..18fbf21 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -428,8 +428,8 @@ struct wined3d_rendertarget_view *d3d9_surface_get_rendertarget_view(struct d3d9 if (surface->wined3d_rtv) return surface->wined3d_rtv;
- if (FAILED(hr = wined3d_rendertarget_view_create_from_surface(surface->wined3d_surface, - surface, &d3d9_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, &d3d9_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 846f7fd..e621356 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -160,6 +160,28 @@ HRESULT CDECL wined3d_rendertarget_view_create_from_surface(struct wined3d_surfa 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) +{ + struct wined3d_resource *sub_resource; + + TRACE("texture %p, sub_resource_idx %u, parent %p, parent_ops %p, view %p.\n", + texture, sub_resource_idx, parent, parent_ops, view); + + if (!(sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx))) + return WINED3DERR_INVALIDCALL; + + if (sub_resource->type != WINED3D_RTYPE_SURFACE) + { + FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(texture->resource.type)); + return WINED3DERR_INVALIDCALL; + } + + return wined3d_rendertarget_view_create_from_surface(surface_from_resource(sub_resource), + parent, parent_ops, view); +} + ULONG CDECL wined3d_shader_resource_view_incref(struct wined3d_shader_resource_view *view) { ULONG refcount = InterlockedIncrement(&view->refcount); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 6720350..5b87b18 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -187,6 +187,7 @@
@ 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) @ cdecl wined3d_rendertarget_view_get_resource(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 82ad493..0f27924 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2430,6 +2430,9 @@ HRESULT __cdecl wined3d_rendertarget_view_create(const struct wined3d_rendertarg 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); ULONG __cdecl wined3d_rendertarget_view_decref(struct wined3d_rendertarget_view *view); void * __cdecl wined3d_rendertarget_view_get_parent(const struct wined3d_rendertarget_view *view); struct wined3d_resource * __cdecl wined3d_rendertarget_view_get_resource(const struct wined3d_rendertarget_view *view);