Henri Verbeet : ddraw: Print an ERR for non-zero sub-resource indices in ddraw_surface7_Flip().
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Feb 1 09:24:45 CST 2016
Module: wine
Branch: master
Commit: 8ae4580137c2fbd4815e7e7eababf3bc7a0dba65
URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ae4580137c2fbd4815e7e7eababf3bc7a0dba65
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Fri Jan 29 18:48:56 2016 +0100
ddraw: Print an ERR for non-zero sub-resource indices in ddraw_surface7_Flip().
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/ddraw/surface.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index 3e57ad6..c9ac73c 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -1239,6 +1239,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7
tmp_rtv = ddraw_surface_get_rendertarget_view(dst_impl);
tmp = dst_impl->wined3d_surface;
+ if (dst_impl->sub_resource_idx)
+ ERR("Invalid sub-resource index %u on surface %p.\n", dst_impl->sub_resource_idx, dst_impl);
texture = dst_impl->wined3d_texture;
rtv = wined3d_device_get_rendertarget_view(dst_impl->ddraw->wined3d_device, 0);
ddraw_texture = wined3d_texture_get_parent(dst_impl->wined3d_texture);
@@ -1271,6 +1273,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7
dst_impl->wined3d_surface = src_impl->wined3d_surface;
prev_ddraw_texture = wined3d_texture_get_parent(src_impl->wined3d_texture);
wined3d_resource_set_parent(wined3d_texture_get_resource(src_impl->wined3d_texture), ddraw_texture);
+ if (src_impl->sub_resource_idx)
+ ERR("Invalid sub-resource index %u on surface %p.\n", src_impl->sub_resource_idx, src_impl);
dst_impl->wined3d_texture = src_impl->wined3d_texture;
ddraw_texture = prev_ddraw_texture;
}
@@ -1302,6 +1306,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7
prev_ddraw_texture = wined3d_texture_get_parent(src_impl->wined3d_texture);
wined3d_resource_set_parent(wined3d_texture_get_resource(src_impl->wined3d_texture), ddraw_texture);
ddraw_texture = prev_ddraw_texture;
+ if (src_impl->sub_resource_idx)
+ ERR("Invalid sub-resource index %u on surface %p.\n", src_impl->sub_resource_idx, src_impl);
dst_impl->wined3d_texture = src_impl->wined3d_texture;
dst_impl = src_impl;
}
More information about the wine-cvs
mailing list