Henri Verbeet : wined3d: Return a failure code if creating the staging texture failed in surface_cpu_blt ().
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Apr 22 09:55:13 CDT 2016
Module: wine
Branch: master
Commit: 82044bc9192c26aba8399785be0da38e2ebf7cc9
URL: http://source.winehq.org/git/wine.git/?a=commit;h=82044bc9192c26aba8399785be0da38e2ebf7cc9
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Thu Apr 21 17:05:06 2016 +0200
wined3d: Return a failure code if creating the staging texture failed in surface_cpu_blt().
Note that we return immediately. The textures aren't mapped yet here, so we
shouldn't try to unmap them.
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wined3d/surface.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 8463666..367bd95 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -3408,9 +3408,9 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int
{
if (!(converted_texture = surface_convert_format(src_texture, src_sub_resource_idx, dst_format)))
{
- /* The conv function writes a FIXME */
- WARN("Cannot convert source surface format to dest format.\n");
- goto release;
+ FIXME("Cannot convert %s to %s.\n", debug_d3dformat(src_texture->resource.format->id),
+ debug_d3dformat(dst_texture->resource.format->id));
+ return WINED3DERR_NOTAVAILABLE;
}
src_texture = converted_texture;
src_sub_resource_idx = 0;
More information about the wine-cvs
mailing list