Mesa (staging/19.3): iris: Fix "Force Zero RTA Index Enable" setting again

[GitLab Mirror]

Module: Mesa
Branch: staging/19.3
Commit: 5cee7ad873d437ac58b739d4b159c9a4352f99e5
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5cee7ad873d437ac58b739d4b159c9a4352f99e5

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Sun Nov  3 23:50:38 2019 -0800

iris: Fix "Force Zero RTA Index Enable" setting again

In 2ca0d913ea8, we began updating cso_fb->layers to the actual layer
count, rather than 0.  This fixed cases where we were setting "Force
Zero RTA Index Enable" even when doing layered rendering.  Sadly, it
also broke the check entirely: cso_fb->layers is now 1 for non-layered
cases, but the Force Zero RTA Index check was still comparing for 0.

Fixes: 2ca0d913ea8 ("iris: Fix framebuffer layer count")
(cherry picked from commit fc7b7480867d6049ca12f87d9b6ab0d9ad55d59f)

---

 src/gallium/drivers/iris/iris_state.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c
index da4ea2cc38d..f6f4a7f6168 100644
--- a/src/gallium/drivers/iris/iris_state.c
+++ b/src/gallium/drivers/iris/iris_state.c
@@ -5509,7 +5509,7 @@ iris_upload_dirty_render_state(struct iris_context *ice,
              BRW_BARYCENTRIC_NONPERSPECTIVE_BITS)
             cl.NonPerspectiveBarycentricEnable = true;
 
-         cl.ForceZeroRTAIndexEnable = cso_fb->layers == 0;
+         cl.ForceZeroRTAIndexEnable = cso_fb->layers <= 1;
          cl.MaximumVPIndex = ice->state.num_viewports - 1;
       }
       iris_emit_merge(batch, cso_rast->clip, dynamic_clip,