[PATCH 1/2] wined3d: Ignore multisample quality for MULTISAMPLE_NONE in context_find_fbo_entry().

Paul Gofman gofmanp at gmail.com
Wed Feb 6 15:09:38 CST 2019


Fixes 1 of 2 issues discussed in https://bugs.winehq.org/show_bug.cgi?id=39080.

Signed-off-by: Paul Gofman <gofmanp at gmail.com>
---
 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 37203738fe..c7eb7849fc 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,
-- 
2.20.1




More information about the wine-devel mailing list