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@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wined3d: Return a failure code if creating the staging texture failed in surface_cpu_blt().
82044bc9 · Henri Verbeet · Alexandre Julliard · aaca15f1 · 82044bc9
Commit 82044bc9 authored Apr 21, 2016 by Henri Verbeet Committed by Alexandre Julliard Apr 22, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

surface.c dlls/wined3d/surface.c +3 -3

No files found.
--- 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;