3 files changed, 153 insertions, 166 deletions

diff --git a/src/shader_recompiler/CMakeLists.txt b/src/shader_recompiler/CMakeLists.txt
index 0d55924a7..becdb7d54 100644
--- a/src/shader_recompiler/CMakeLists.txt
+++ b/src/shader_recompiler/CMakeLists.txt
@@ -13,7 +13,6 @@ add_library(shader_recompiler STATIC
     backend/glasm/emit_glasm_convert.cpp
     backend/glasm/emit_glasm_floating_point.cpp
     backend/glasm/emit_glasm_image.cpp
-    backend/glasm/emit_glasm_image_atomic.cpp
     backend/glasm/emit_glasm_instructions.h
     backend/glasm/emit_glasm_integer.cpp
     backend/glasm/emit_glasm_logical.cpp
diff --git a/src/shader_recompiler/backend/glasm/emit_glasm_image.cpp b/src/shader_recompiler/backend/glasm/emit_glasm_image.cpp
index 385ca51ac..a7def0897 100644
--- a/src/shader_recompiler/backend/glasm/emit_glasm_image.cpp
+++ b/src/shader_recompiler/backend/glasm/emit_glasm_image.cpp
@@ -205,6 +205,16 @@ std::string_view FormatStorage(ImageFormat format) {
     }
     throw InvalidArgument("Invalid image format {}", format);
 }
+
+template <typename T>
+void ImageAtomic(EmitContext& ctx, IR::Inst& inst, const IR::Value& index, Register coord, T value,
+                 std::string_view op) {
+    const auto info{inst.Flags<IR::TextureInstInfo>()};
+    const std::string_view type{TextureType(info)};
+    const std::string image{Image(ctx, info, index)};
+    const Register ret{ctx.reg_alloc.Define(inst)};
+    ctx.Add("ATOMIM.{} {},{},{},{},{};", op, ret, value, coord, image, type);
+}
 } // Anonymous namespace
 
 void EmitImageSampleImplicitLod(EmitContext& ctx, IR::Inst& inst, const IR::Value& index,
@@ -590,6 +600,61 @@ void EmitImageWrite(EmitContext& ctx, IR::Inst& inst, const IR::Value& index, Re
     ctx.Add("STOREIM.{} {},{},{},{};", format, image, color, coord, type);
 }
 
+void EmitImageAtomicIAdd32(EmitContext& ctx, IR::Inst& inst, const IR::Value& index, Register coord,
+                           ScalarU32 value) {
+    ImageAtomic(ctx, inst, index, coord, value, "ADD.U32");
+}
+
+void EmitImageAtomicSMin32(EmitContext& ctx, IR::Inst& inst, const IR::Value& index, Register coord,
+                           ScalarS32 value) {
+    ImageAtomic(ctx, inst, index, coord, value, "MIN.S32");
+}
+
+void EmitImageAtomicUMin32(EmitContext& ctx, IR::Inst& inst, const IR::Value& index, Register coord,
+                           ScalarU32 value) {
+    ImageAtomic(ctx, inst, index, coord, value, "MIN.U32");
+}
+
+void EmitImageAtomicSMax32(EmitContext& ctx, IR::Inst& inst, const IR::Value& index, Register coord,
+                           ScalarS32 value) {
+    ImageAtomic(ctx, inst, index, coord, value, "MAX.S32");
+}
+
+void EmitImageAtomicUMax32(EmitContext& ctx, IR::Inst& inst, const IR::Value& index, Register coord,
+                           ScalarU32 value) {
+    ImageAtomic(ctx, inst, index, coord, value, "MAX.U32");
+}
+
+void EmitImageAtomicInc32(EmitContext& ctx, IR::Inst& inst, const IR::Value& index, Register coord,
+                          ScalarU32 value) {
+    ImageAtomic(ctx, inst, index, coord, value, "IWRAP.U32");
+}
+
+void EmitImageAtomicDec32(EmitContext& ctx, IR::Inst& inst, const IR::Value& index, Register coord,
+                          ScalarU32 value) {
+    ImageAtomic(ctx, inst, index, coord, value, "DWRAP.U32");
+}
+
+void EmitImageAtomicAnd32(EmitContext& ctx, IR::Inst& inst, const IR::Value& index, Register coord,
+                          ScalarU32 value) {
+    ImageAtomic(ctx, inst, index, coord, value, "AND.U32");
+}
+
+void EmitImageAtomicOr32(EmitContext& ctx, IR::Inst& inst, const IR::Value& index, Register coord,
+                         ScalarU32 value) {
+    ImageAtomic(ctx, inst, index, coord, value, "OR.U32");
+}
+
+void EmitImageAtomicXor32(EmitContext& ctx, IR::Inst& inst, const IR::Value& index, Register coord,
+                          ScalarU32 value) {
+    ImageAtomic(ctx, inst, index, coord, value, "XOR.U32");
+}
+
+void EmitImageAtomicExchange32(EmitContext& ctx, IR::Inst& inst, const IR::Value& index,
+                               Register coord, ScalarU32 value) {
+    ImageAtomic(ctx, inst, index, coord, value, "EXCH.U32");
+}
+
 void EmitBindlessImageSampleImplicitLod(EmitContext&) {
     throw LogicError("Unreachable instruction");
 }
@@ -686,4 +751,92 @@ void EmitBoundImageWrite(EmitContext&) {
     throw LogicError("Unreachable instruction");
 }
 
+void EmitBindlessImageAtomicIAdd32(EmitContext&) {
+    throw LogicError("Unreachable instruction");
+}
+
+void EmitBindlessImageAtomicSMin32(EmitContext&) {
+    throw LogicError("Unreachable instruction");
+}
+
+void EmitBindlessImageAtomicUMin32(EmitContext&) {
+    throw LogicError("Unreachable instruction");
+}
+
+void EmitBindlessImageAtomicSMax32(EmitContext&) {
+    throw LogicError("Unreachable instruction");
+}
+
+void EmitBindlessImageAtomicUMax32(EmitContext&) {
+    throw LogicError("Unreachable instruction");
+}
+
+void EmitBindlessImageAtomicInc32(EmitContext&) {
+    throw LogicError("Unreachable instruction");
+}
+
+void EmitBindlessImageAtomicDec32(EmitContext&) {
+    throw LogicError("Unreachable instruction");
+}
+
+void EmitBindlessImageAtomicAnd32(EmitContext&) {
+    throw LogicError("Unreachable instruction");
+}
+
+void EmitBindlessImageAtomicOr32(EmitContext&) {
+    throw LogicError("Unreachable instruction");
+}
+
+void EmitBindlessImageAtomicXor32(EmitContext&) {
+    throw LogicError("Unreachable instruction");
+}
+
+void EmitBindlessImageAtomicExchange32(EmitContext&) {
+    throw LogicError("Unreachable instruction");
+}
+
+void EmitBoundImageAtomicIAdd32(EmitContext&) {
+    throw LogicError("Unreachable instruction");
+}
+
+void EmitBoundImageAtomicSMin32(EmitContext&) {
+    throw LogicError("Unreachable instruction");
+}
+
+void EmitBoundImageAtomicUMin32(EmitContext&) {
+    throw LogicError("Unreachable instruction");
+}
+
+void EmitBoundImageAtomicSMax32(EmitContext&) {
+    throw LogicError("Unreachable instruction");
+}
+
+void EmitBoundImageAtomicUMax32(EmitContext&) {
+    throw LogicError("Unreachable instruction");
+}
+
+void EmitBoundImageAtomicInc32(EmitContext&) {
+    throw LogicError("Unreachable instruction");
+}
+
+void EmitBoundImageAtomicDec32(EmitContext&) {
+    throw LogicError("Unreachable instruction");
+}
+
+void EmitBoundImageAtomicAnd32(EmitContext&) {
+    throw LogicError("Unreachable instruction");
+}
+
+void EmitBoundImageAtomicOr32(EmitContext&) {
+    throw LogicError("Unreachable instruction");
+}
+
+void EmitBoundImageAtomicXor32(EmitContext&) {
+    throw LogicError("Unreachable instruction");
+}
+
+void EmitBoundImageAtomicExchange32(EmitContext&) {
+    throw LogicError("Unreachable instruction");
+}
+
 } // namespace Shader::Backend::GLASM
diff --git a/src/shader_recompiler/backend/glasm/emit_glasm_image_atomic.cpp b/src/shader_recompiler/backend/glasm/emit_glasm_image_atomic.cpp
deleted file mode 100644
index f82cf9ffc..000000000
--- a/src/shader_recompiler/backend/glasm/emit_glasm_image_atomic.cpp
+++ /dev/null
@@ -1,165 +0,0 @@
-// Copyright 2021 yuzu Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#include "shader_recompiler/backend/glasm/emit_context.h"
-#include "shader_recompiler/backend/glasm/emit_glasm_instructions.h"
-#include "shader_recompiler/frontend/ir/value.h"
-
-namespace Shader::Backend::GLASM {
-
-void EmitImageAtomicIAdd32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                           [[maybe_unused]] const IR::Value& index,
-                           [[maybe_unused]] Register coords, [[maybe_unused]] ScalarU32 value) {
-    throw NotImplementedException("GLASM instruction");
-}
-
-void EmitImageAtomicSMin32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                           [[maybe_unused]] const IR::Value& index,
-                           [[maybe_unused]] Register coords, [[maybe_unused]] ScalarS32 value) {
-    throw NotImplementedException("GLASM instruction");
-}
-
-void EmitImageAtomicUMin32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                           [[maybe_unused]] const IR::Value& index,
-                           [[maybe_unused]] Register coords, [[maybe_unused]] ScalarU32 value) {
-    throw NotImplementedException("GLASM instruction");
-}
-
-void EmitImageAtomicSMax32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                           [[maybe_unused]] const IR::Value& index,
-                           [[maybe_unused]] Register coords, [[maybe_unused]] ScalarS32 value) {
-    throw NotImplementedException("GLASM instruction");
-}
-
-void EmitImageAtomicUMax32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                           [[maybe_unused]] const IR::Value& index,
-                           [[maybe_unused]] Register coords, [[maybe_unused]] ScalarU32 value) {
-    throw NotImplementedException("GLASM instruction");
-}
-
-void EmitImageAtomicInc32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                          [[maybe_unused]] const IR::Value& index, [[maybe_unused]] Register coords,
-                          [[maybe_unused]] ScalarU32 value) {
-    throw NotImplementedException("GLASM instruction");
-}
-
-void EmitImageAtomicDec32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                          [[maybe_unused]] const IR::Value& index, [[maybe_unused]] Register coords,
-                          [[maybe_unused]] ScalarU32 value) {
-    throw NotImplementedException("GLASM instruction");
-}
-
-void EmitImageAtomicAnd32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                          [[maybe_unused]] const IR::Value& index, [[maybe_unused]] Register coords,
-                          [[maybe_unused]] ScalarU32 value) {
-    throw NotImplementedException("GLASM instruction");
-}
-
-void EmitImageAtomicOr32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                         [[maybe_unused]] const IR::Value& index, [[maybe_unused]] Register coords,
-                         [[maybe_unused]] ScalarU32 value) {
-    throw NotImplementedException("GLASM instruction");
-}
-
-void EmitImageAtomicXor32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                          [[maybe_unused]] const IR::Value& index, [[maybe_unused]] Register coords,
-                          [[maybe_unused]] ScalarU32 value) {
-    throw NotImplementedException("GLASM instruction");
-}
-
-void EmitImageAtomicExchange32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                               [[maybe_unused]] const IR::Value& index,
-                               [[maybe_unused]] Register coords, [[maybe_unused]] ScalarU32 value) {
-    throw NotImplementedException("GLASM instruction");
-}
-
-void EmitBindlessImageAtomicIAdd32(EmitContext&) {
-    throw LogicError("Unreachable instruction");
-}
-
-void EmitBindlessImageAtomicSMin32(EmitContext&) {
-    throw LogicError("Unreachable instruction");
-}
-
-void EmitBindlessImageAtomicUMin32(EmitContext&) {
-    throw LogicError("Unreachable instruction");
-}
-
-void EmitBindlessImageAtomicSMax32(EmitContext&) {
-    throw LogicError("Unreachable instruction");
-}
-
-void EmitBindlessImageAtomicUMax32(EmitContext&) {
-    throw LogicError("Unreachable instruction");
-}
-
-void EmitBindlessImageAtomicInc32(EmitContext&) {
-    throw LogicError("Unreachable instruction");
-}
-
-void EmitBindlessImageAtomicDec32(EmitContext&) {
-    throw LogicError("Unreachable instruction");
-}
-
-void EmitBindlessImageAtomicAnd32(EmitContext&) {
-    throw LogicError("Unreachable instruction");
-}
-
-void EmitBindlessImageAtomicOr32(EmitContext&) {
-    throw LogicError("Unreachable instruction");
-}
-
-void EmitBindlessImageAtomicXor32(EmitContext&) {
-    throw LogicError("Unreachable instruction");
-}
-
-void EmitBindlessImageAtomicExchange32(EmitContext&) {
-    throw LogicError("Unreachable instruction");
-}
-
-void EmitBoundImageAtomicIAdd32(EmitContext&) {
-    throw LogicError("Unreachable instruction");
-}
-
-void EmitBoundImageAtomicSMin32(EmitContext&) {
-    throw LogicError("Unreachable instruction");
-}
-
-void EmitBoundImageAtomicUMin32(EmitContext&) {
-    throw LogicError("Unreachable instruction");
-}
-
-void EmitBoundImageAtomicSMax32(EmitContext&) {
-    throw LogicError("Unreachable instruction");
-}
-
-void EmitBoundImageAtomicUMax32(EmitContext&) {
-    throw LogicError("Unreachable instruction");
-}
-
-void EmitBoundImageAtomicInc32(EmitContext&) {
-    throw LogicError("Unreachable instruction");
-}
-
-void EmitBoundImageAtomicDec32(EmitContext&) {
-    throw LogicError("Unreachable instruction");
-}
-
-void EmitBoundImageAtomicAnd32(EmitContext&) {
-    throw LogicError("Unreachable instruction");
-}
-
-void EmitBoundImageAtomicOr32(EmitContext&) {
-    throw LogicError("Unreachable instruction");
-}
-
-void EmitBoundImageAtomicXor32(EmitContext&) {
-    throw LogicError("Unreachable instruction");
-}
-
-void EmitBoundImageAtomicExchange32(EmitContext&) {
-    throw LogicError("Unreachable instruction");
-}
-
-} // namespace Shader::Backend::GLASM