Mesa (main): aux/draw: fix aalines and aapoints for shaders with explicit FragData outputs

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: bd893bfdf854c38ff2a2d2fcc943f2609505cefa
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=bd893bfdf854c38ff2a2d2fcc943f2609505cefa

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Fri May 28 09:53:00 2021 -0400

aux/draw: fix aalines and aapoints for shaders with explicit FragData outputs

all color outputs need to be rewritten with coverage, not just FragColor

Reviewed-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11065>

---

 src/gallium/auxiliary/nir/nir_draw_helpers.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/auxiliary/nir/nir_draw_helpers.c b/src/gallium/auxiliary/nir/nir_draw_helpers.c
index b5706631fb4..5122ce401f7 100644
--- a/src/gallium/auxiliary/nir/nir_draw_helpers.c
+++ b/src/gallium/auxiliary/nir/nir_draw_helpers.c
@@ -167,7 +167,7 @@ nir_lower_aaline_block(nir_block *block,
       nir_variable *var = nir_intrinsic_get_var(intrin, 0);
       if (var->data.mode != nir_var_shader_out)
          continue;
-      if (var->data.location != FRAG_RESULT_COLOR)
+      if (var->data.location < FRAG_RESULT_DATA0 && var->data.location != FRAG_RESULT_COLOR)
          continue;
 
       nir_ssa_def *out_input = intrin->src[1].ssa;
@@ -262,7 +262,7 @@ nir_lower_aapoint_block(nir_block *block,
       nir_variable *var = nir_intrinsic_get_var(intrin, 0);
       if (var->data.mode != nir_var_shader_out)
          continue;
-      if (var->data.location != FRAG_RESULT_COLOR)
+      if (var->data.location < FRAG_RESULT_DATA0 && var->data.location != FRAG_RESULT_COLOR)
          continue;
 
       nir_ssa_def *out_input = intrin->src[1].ssa;