Mesa (master): radeonsi: remove redundant info.uses_fbfetch

[GitLab Mirror]

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

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Thu Sep 17 20:31:02 2020 -0400

radeonsi: remove redundant info.uses_fbfetch

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6782>

---

 src/gallium/drivers/radeonsi/si_descriptors.c | 2 +-
 src/gallium/drivers/radeonsi/si_shader.h      | 1 -
 src/gallium/drivers/radeonsi/si_shader_nir.c  | 4 ----
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c
index 8f71ffdd2f3..2d0bfc47e24 100644
--- a/src/gallium/drivers/radeonsi/si_descriptors.c
+++ b/src/gallium/drivers/radeonsi/si_descriptors.c
@@ -863,7 +863,7 @@ void si_update_ps_colorbuf0_slot(struct si_context *sctx)
       return;
 
    /* See whether FBFETCH is used and color buffer 0 is set. */
-   if (sctx->ps_shader.cso && sctx->ps_shader.cso->info.uses_fbfetch &&
+   if (sctx->ps_shader.cso && sctx->ps_shader.cso->info.base.fs.uses_fbfetch_output &&
        sctx->framebuffer.state.nr_cbufs && sctx->framebuffer.state.cbufs[0])
       surf = sctx->framebuffer.state.cbufs[0];
 
diff --git a/src/gallium/drivers/radeonsi/si_shader.h b/src/gallium/drivers/radeonsi/si_shader.h
index da74404008e..d267612ba80 100644
--- a/src/gallium/drivers/radeonsi/si_shader.h
+++ b/src/gallium/drivers/radeonsi/si_shader.h
@@ -382,7 +382,6 @@ struct si_shader_info {
    bool writes_layer;
    bool uses_bindless_samplers;
    bool uses_bindless_images;
-   bool uses_fbfetch;
 
    /** Whether all codepaths write tess factors in all invocations. */
    bool tessfactors_are_def_in_all_invocs;
diff --git a/src/gallium/drivers/radeonsi/si_shader_nir.c b/src/gallium/drivers/radeonsi/si_shader_nir.c
index 44b1a71a9e7..2d6c6127345 100644
--- a/src/gallium/drivers/radeonsi/si_shader_nir.c
+++ b/src/gallium/drivers/radeonsi/si_shader_nir.c
@@ -137,10 +137,6 @@ static void scan_io_usage(struct si_shader_info *info, nir_intrinsic_instr *intr
          if (is_output_load) {
             /* Output loads have only a few things that we need to track. */
             info->output_readmask[loc] |= mask;
-
-            if (info->stage == MESA_SHADER_FRAGMENT &&
-                nir_intrinsic_io_semantics(intr).fb_fetch_output)
-               info->uses_fbfetch = true;
          } else if (mask) {
             /* Output stores. */
             if (info->stage == MESA_SHADER_GEOMETRY) {