Henri Verbeet : wined3d: Explicitly check for WINED3D_NO3D instead of "d3d_initialized" in surface_convert_format().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: f06f28cf0425cf2f95cda497ed52e06587d551da
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=f06f28cf0425cf2f95cda497e...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Tue Jun  2 04:05:02 2020 +0430

wined3d: Explicitly check for WINED3D_NO3D instead of "d3d_initialized" in surface_convert_format().

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

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

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index ba34938828..0c95f7a43a 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -320,7 +320,7 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr
     struct wined3d_context *context;
     DWORD map_binding;
 
-    if (!(conv = find_converter(src_format->id, dst_format->id)) && (!device->d3d_initialized
+    if (!(conv = find_converter(src_format->id, dst_format->id)) && ((device->wined3d->flags & WINED3D_NO3D)
             || !is_identity_fixup(src_format->color_fixup) || src_format->conv_byte_count
             || !is_identity_fixup(dst_format->color_fixup) || dst_format->conv_byte_count
             || ((src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED)