From: Francisco Jerez <currojerez@riseup.net>
Date: Tue, 26 Apr 2016 00:30:54 +0000 (-0700)
Subject: i965/fs: Emit fixed width memory fence opcode regardless of the dispatch width.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a55452530f7525e9cf5d2619bef66a61b488b4af;p=mesa.git

i965/fs: Emit fixed width memory fence opcode regardless of the dispatch width.

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

diff --git a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp
index b4aeea86f9b..5135828a951 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp
@@ -3428,8 +3428,9 @@ fs_visitor::nir_emit_intrinsic(const fs_builder &bld, nir_intrinsic_instr *instr
    case nir_intrinsic_memory_barrier_buffer:
    case nir_intrinsic_memory_barrier_image:
    case nir_intrinsic_memory_barrier: {
-      const fs_reg tmp = bld.vgrf(BRW_REGISTER_TYPE_UD, 16 / dispatch_width);
-      bld.emit(SHADER_OPCODE_MEMORY_FENCE, tmp)
+      const fs_builder ubld = bld.group(8, 0);
+      const fs_reg tmp = ubld.vgrf(BRW_REGISTER_TYPE_UD, 2);
+      ubld.emit(SHADER_OPCODE_MEMORY_FENCE, tmp)
          ->regs_written = 2;
       break;
    }