From: Kenneth Graunke <kenneth@whitecape.org>
Date: Thu, 12 Jul 2018 17:51:14 +0000 (-0700)
Subject: iris: disable 6x MSAA support
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=44248d16d23dda4fe281209b1019dfa593e496bb;p=mesa.git

iris: disable 6x MSAA support
---

diff --git a/src/gallium/drivers/iris/iris_formats.c b/src/gallium/drivers/iris/iris_formats.c
index 51134a5be64..d42befb4fe2 100644
--- a/src/gallium/drivers/iris/iris_formats.c
+++ b/src/gallium/drivers/iris/iris_formats.c
@@ -21,8 +21,9 @@
  * IN THE SOFTWARE.
  */
 
-#include "util/u_format.h"
+#include "util/bitscan.h"
 #include "util/macros.h"
+#include "util/u_format.h"
 
 #include "iris_resource.h"
 #include "iris_screen.h"
@@ -402,7 +403,7 @@ iris_is_format_supported(struct pipe_screen *pscreen,
    const struct gen_device_info *devinfo = &screen->devinfo;
 
    // XXX: msaa max
-   if (sample_count > 16)
+   if (sample_count > 16 || !util_is_power_of_two_or_zero(sample_count))
       return false;
 
    if (pformat == PIPE_FORMAT_NONE)