wined3d: Disallow upload conversion from compressed formats in surface_convert_format().

The underlying issue is that glCompressedTexSubImage2D() needs the upload format to match the texture's internal format. Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wined3d: Disallow upload conversion from compressed formats in surface_convert_format().
5a6efe63 · Henri Verbeet · Alexandre Julliard · 807733f1 · 5a6efe63
Commit 5a6efe63 authored Feb 08, 2017 by Henri Verbeet Committed by Alexandre Julliard Feb 08, 2017
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

surface.c dlls/wined3d/surface.c +2 -1

No files found.
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -1521,7 +1521,8 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr

    if (!(conv = find_converter(src_format->id, dst_format->id)) && (!device->d3d_initialized
            || !is_identity_fixup(src_format->color_fixup) || src_format->convert
-            || !is_identity_fixup(dst_format->color_fixup) || dst_format->convert))
+            || !is_identity_fixup(dst_format->color_fixup) || dst_format->convert
+            || (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED)))
    {
        FIXME("Cannot find a conversion function from format %s to %s.\n",
                debug_d3dformat(src_format->id), debug_d3dformat(dst_format->id));