Mesa (master): intel/nir: Lowering image loads and stores trashes all metadata

[GitLab Mirror]

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

Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Thu Aug 30 12:50:31 2018 -0500

intel/nir: Lowering image loads and stores trashes all metadata

This fixes the GL_ARB_fragment_shader_interlock piglit test on gen8
platforms where the lack of metadata dirtying was causing another pass
to accidentally delete a much needed loop.

https://bugs.freedesktop.org/show_bug.cgi?id=107745
Fixes: 37f7983bcca1 "intel/compiler: Do image load/store lowering..."
Jason Ekstrand <jason at jlekstrand.net> writes:
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira at intel.com>

---

 src/intel/compiler/brw_nir_lower_image_load_store.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/intel/compiler/brw_nir_lower_image_load_store.c b/src/intel/compiler/brw_nir_lower_image_load_store.c
index de6f7683be..e8083a80cb 100644
--- a/src/intel/compiler/brw_nir_lower_image_load_store.c
+++ b/src/intel/compiler/brw_nir_lower_image_load_store.c
@@ -817,8 +817,8 @@ brw_nir_lower_image_load_store(nir_shader *shader,
          }
       }
 
-      nir_metadata_preserve(function->impl, nir_metadata_block_index |
-                                            nir_metadata_dominance);
+      if (progress)
+         nir_metadata_preserve(function->impl, nir_metadata_none);
    }
 
    return progress;