Mesa (master): isl/gen6: correctly check msaa layout samples count

Emil Velikov evelikov at kemper.freedesktop.org
Fri Oct 14 10:54:22 UTC 2016


Module: Mesa
Branch: master
Commit: 84f9ef1de4680b48d646841965f963ea2b724ab2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=84f9ef1de4680b48d646841965f963ea2b724ab2

Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Tue Oct 11 18:26:15 2016 +0100

isl/gen6: correctly check msaa layout samples count

Samples == 1 is a valid value, so returning false is plain wrong.
Seeming copy/paste typo introduced since day 1.

Fixes: afdadec77f5 ("isl: Implement isl_surf_init() for gen4-gen9")
Cc: mesa-stable at lists.freedesktop.org
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
Reviewed-by: Chad Versace <chadversary at chromium.org>

---

 src/intel/isl/isl_gen6.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/intel/isl/isl_gen6.c b/src/intel/isl/isl_gen6.c
index b30998d..07c08f6 100644
--- a/src/intel/isl/isl_gen6.c
+++ b/src/intel/isl/isl_gen6.c
@@ -35,7 +35,7 @@ gen6_choose_msaa_layout(const struct isl_device *dev,
 
    if (info->samples == 1) {
       *msaa_layout = ISL_MSAA_LAYOUT_NONE;
-      return false;
+      return true;
    }
 
    if (!isl_format_supports_multisampling(dev->info, info->format))




More information about the mesa-commit mailing list