From: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Date: Mon, 13 Jan 2020 23:48:12 +0000 (-0800)
Subject: intel/fs: Only use SLM fence in compute shaders
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=edf6a40cb2a09d58f9244abf0a1432a836a350ce;p=mesa.git

intel/fs: Only use SLM fence in compute shaders

Fixes: b390ff35170 ("intel/fs: Add support for SLM fence in Gen11")
Fixes: e142061399c ("intel/fs: Implement scoped_memory_barrier")

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
---

diff --git a/src/intel/compiler/brw_fs_nir.cpp b/src/intel/compiler/brw_fs_nir.cpp
index c3748b503a9..fca69bd184d 100644
--- a/src/intel/compiler/brw_fs_nir.cpp
+++ b/src/intel/compiler/brw_fs_nir.cpp
@@ -4299,6 +4299,9 @@ fs_visitor::nir_emit_intrinsic(const fs_builder &bld, nir_intrinsic_instr *instr
          }
       }
 
+      if (stage != MESA_SHADER_COMPUTE)
+         slm_fence = false;
+
       /* Be conservative in Gen11+ and always stall in a fence.  Since there
        * are two different fences, and shader might want to synchronize
        * between them.