Paul Gofman : wined3d: Ignore multisample quality for MULTISAMPLE_NONE in context_find_fbo_entry ().

[Alexandre Julliard]

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

Author: Paul Gofman <gofmanp at gmail.com>
Date:   Thu Feb  7 00:09:38 2019 +0300

wined3d: Ignore multisample quality for MULTISAMPLE_NONE in context_find_fbo_entry().

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39080
Signed-off-by: Paul Gofman <gofmanp at gmail.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

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

diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index 4096673..81b1fc0 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -599,7 +599,8 @@ static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context,
             depth_stencil = &ds_null;
         }
         else if (ds_texture->resource.multisample_type != rt_texture->resource.multisample_type
-                || ds_texture->resource.multisample_quality != rt_texture->resource.multisample_quality)
+                || (ds_texture->resource.multisample_type
+                && ds_texture->resource.multisample_quality != rt_texture->resource.multisample_quality))
         {
             WARN("Color multisample type %u and quality %u, depth stencil has %u and %u, disabling ds buffer.\n",
                     rt_texture->resource.multisample_type, rt_texture->resource.multisample_quality,