Riccardo Bortolato : d3d8: Replace wined3d_surface_get_resource with wined3d_texture_get_sub_resource in device.c.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Oct 13 10:53:46 CDT 2015
Module: wine
Branch: master
Commit: a996804a0d057fa842df17e57fa7568f2905e490
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a996804a0d057fa842df17e57fa7568f2905e490
Author: Riccardo Bortolato <rikyz619 at gmail.com>
Date: Mon Oct 12 17:23:32 2015 +0200
d3d8: Replace wined3d_surface_get_resource with wined3d_texture_get_sub_resource in device.c.
Signed-off-by: Riccardo Bortolato <rikyz619 at gmail.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3d8/device.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c
index 51aae17..0648f51 100644
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -1058,7 +1058,7 @@ static HRESULT WINAPI d3d8_device_CopyRects(IDirect3DDevice8 *iface,
* destination texture is in WINED3D_POOL_DEFAULT. */
wined3d_mutex_lock();
- wined3d_resource = wined3d_surface_get_resource(src->wined3d_surface);
+ wined3d_resource = wined3d_texture_get_sub_resource(src->wined3d_texture, src->sub_resource_idx);
wined3d_resource_get_desc(wined3d_resource, &wined3d_desc);
if (wined3d_desc.usage & WINED3DUSAGE_DEPTHSTENCIL)
{
@@ -1070,7 +1070,7 @@ static HRESULT WINAPI d3d8_device_CopyRects(IDirect3DDevice8 *iface,
src_w = wined3d_desc.width;
src_h = wined3d_desc.height;
- wined3d_resource = wined3d_surface_get_resource(dst->wined3d_surface);
+ wined3d_resource = wined3d_texture_get_sub_resource(dst->wined3d_texture, dst->sub_resource_idx);
wined3d_resource_get_desc(wined3d_resource, &wined3d_desc);
if (wined3d_desc.usage & WINED3DUSAGE_DEPTHSTENCIL)
{
@@ -1202,13 +1202,13 @@ static HRESULT WINAPI d3d8_device_SetRenderTarget(IDirect3DDevice8 *iface,
return D3DERR_NOTFOUND;
}
original_surface = wined3d_rendertarget_view_get_sub_resource_parent(original_rtv);
- wined3d_resource = wined3d_surface_get_resource(original_surface->wined3d_surface);
+ wined3d_resource = wined3d_texture_get_sub_resource(original_surface->wined3d_texture, original_surface->sub_resource_idx);
}
else
- wined3d_resource = wined3d_surface_get_resource(rt_impl->wined3d_surface);
+ wined3d_resource = wined3d_texture_get_sub_resource(rt_impl->wined3d_texture, rt_impl->sub_resource_idx);
wined3d_resource_get_desc(wined3d_resource, &rt_desc);
- wined3d_resource = wined3d_surface_get_resource(ds_impl->wined3d_surface);
+ wined3d_resource = wined3d_texture_get_sub_resource(ds_impl->wined3d_texture, ds_impl->sub_resource_idx);
wined3d_resource_get_desc(wined3d_resource, &ds_desc);
if (ds_desc.width < rt_desc.width || ds_desc.height < rt_desc.height)
More information about the wine-cvs
mailing list