[v3 signed 4/6] wined3d: introduce a new wined3d_rendertarget_view_create_from_sub_resource function
Riccardo Bortolato
rikyz619 at gmail.com
Thu Oct 22 05:01:11 CDT 2015
initial usage in d3d9
Signed-off-by: Riccardo Bortolato <rikyz619 at gmail.com>
---
dlls/d3d9/surface.c | 4 ++--
dlls/wined3d/view.c | 21 +++++++++++++++++++++
dlls/wined3d/wined3d.spec | 1 +
include/wine/wined3d.h | 2 ++
4 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c
index e4d9896..58d2309 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..3caff04 100644
--- a/dlls/wined3d/view.c
+++ b/dlls/wined3d/view.c
@@ -145,6 +145,27 @@ HRESULT CDECL wined3d_rendertarget_view_create(const struct wined3d_rendertarget
return WINED3D_OK;
}
+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_rendertarget_view_desc desc;
+ struct wined3d_resource *sub_resource;
+ struct wined3d_surface *surface;
+
+ TRACE("texture %p, sub_resource_idx %u, parent %p, parent_ops %p, view %p.\n",
+ texture, sub_resource_idx, parent, parent_ops, view);
+
+ sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx);
+ surface = surface_from_resource(sub_resource);
+
+ desc.format_id = texture->resource.format->id;
+ desc.u.texture.level_idx = surface->texture_level;
+ desc.u.texture.layer_idx = surface->texture_layer;
+ desc.u.texture.layer_count = texture->layer_count;
+
+ return wined3d_rendertarget_view_create(&desc, &texture->resource, parent, parent_ops, 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)
{
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index 659f720..4144446 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -186,6 +186,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 73c438a..7341ac8 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2428,6 +2428,8 @@ 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);
--
1.9.1
More information about the wine-patches
mailing list