4 files changed, 22 insertions, 0 deletions

diff --git a/src/shader_recompiler/frontend/ir/ir_emitter.cpp b/src/shader_recompiler/frontend/ir/ir_emitter.cpp
index ddaa873f2..2fd90303f 100644
--- a/src/shader_recompiler/frontend/ir/ir_emitter.cpp
+++ b/src/shader_recompiler/frontend/ir/ir_emitter.cpp
@@ -82,6 +82,10 @@ void IREmitter::SelectionMerge(Block* merge_block) {
     Inst(Opcode::SelectionMerge, merge_block);
 }
 
+void IREmitter::MemoryBarrier(BarrierInstInfo info) {
+    Inst(Opcode::MemoryBarrier, Flags{info});
+}
+
 void IREmitter::Return() {
     block->SetReturn();
     Inst(Opcode::Return);
diff --git a/src/shader_recompiler/frontend/ir/ir_emitter.h b/src/shader_recompiler/frontend/ir/ir_emitter.h
index 6e04eec7f..5bebf66e3 100644
--- a/src/shader_recompiler/frontend/ir/ir_emitter.h
+++ b/src/shader_recompiler/frontend/ir/ir_emitter.h
@@ -136,6 +136,8 @@ public:
     [[nodiscard]] Value Select(const U1& condition, const Value& true_value,
                                const Value& false_value);
 
+    [[nodiscard]] void MemoryBarrier(BarrierInstInfo info);
+
     template <typename Dest, typename Source>
     [[nodiscard]] Dest BitCast(const Source& value);
 
diff --git a/src/shader_recompiler/frontend/ir/modifiers.h b/src/shader_recompiler/frontend/ir/modifiers.h
index 90078f535..7730c25a9 100644
--- a/src/shader_recompiler/frontend/ir/modifiers.h
+++ b/src/shader_recompiler/frontend/ir/modifiers.h
@@ -25,6 +25,14 @@ enum class FpRounding : u8 {
     RZ,       // Round towards zero
 };
 
+enum class MemoryScope : u32 {
+  DontCare,
+  Warp,
+  Workgroup,
+  Device,
+  System
+};
+
 struct FpControl {
     bool no_contraction{false};
     FpRounding rounding{FpRounding::DontCare};
@@ -32,6 +40,11 @@ struct FpControl {
 };
 static_assert(sizeof(FpControl) <= sizeof(u32));
 
+union BarrierInstInfo {
+    u32 raw;
+    BitField<0, 3, MemoryScope> scope;
+};
+
 union TextureInstInfo {
     u32 raw;
     BitField<0, 8, TextureType> type;
diff --git a/src/shader_recompiler/frontend/ir/opcodes.inc b/src/shader_recompiler/frontend/ir/opcodes.inc
index 702372775..d9e0d5471 100644
--- a/src/shader_recompiler/frontend/ir/opcodes.inc
+++ b/src/shader_recompiler/frontend/ir/opcodes.inc
@@ -16,6 +16,9 @@ OPCODE(Return,                                              Void,
 OPCODE(Unreachable,                                         Void,                                                                                           )
 OPCODE(DemoteToHelperInvocation,                            Void,           Label,                                                                          )
 
+// Barriers
+OPCODE(MemoryBarrier,                                       Void,                                                                                           )
+
 // Special operations
 OPCODE(Prologue,                                            Void,                                                                                           )
 OPCODE(Epilogue,                                            Void,                                                                                           )