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

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: 9e47cf696bb499f99f9f3c6437dafba34bc80180
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9e47cf696bb499f99f9f3c6437...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Wed Feb  8 16:46:36 2017 +0100

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(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
(cherry picked from commit 5a6efe632918fd18758897c39910d52791d46053)
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>

---

 dlls/wined3d/surface.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 18b008c..7d26709 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -1519,7 +1519,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));