From ff13aff862fe021ac103d82055a14a0b7abde19c Mon Sep 17 00:00:00 2001
From: ElBread3 <92335081+ElBread3@users.noreply.github.com>
Date: Thu, 3 Oct 2024 11:48:54 -0500
Subject: [PATCH] video_core: IMAGEGATHER4_C_O (#1210)

---
 src/shader_recompiler/frontend/decode.cpp                  | 1 +
 src/shader_recompiler/frontend/format.cpp                  | 4 ++--
 src/shader_recompiler/frontend/translate/vector_memory.cpp | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/shader_recompiler/frontend/decode.cpp b/src/shader_recompiler/frontend/decode.cpp
index 66df5c292..98f97dd12 100644
--- a/src/shader_recompiler/frontend/decode.cpp
+++ b/src/shader_recompiler/frontend/decode.cpp
@@ -313,6 +313,7 @@ void GcnDecodeContext::repairOperandType() {
         m_instruction.src[2].type = ScalarType::Uint64;
         break;
     case Opcode::IMAGE_GATHER4_C:
+    case Opcode::IMAGE_GATHER4_C_O:
         m_instruction.src[0].type = ScalarType::Any;
         break;
     default:
diff --git a/src/shader_recompiler/frontend/format.cpp b/src/shader_recompiler/frontend/format.cpp
index 90f10498a..7b3ad00ba 100644
--- a/src/shader_recompiler/frontend/format.cpp
+++ b/src/shader_recompiler/frontend/format.cpp
@@ -3625,8 +3625,8 @@ constexpr std::array<InstFormat, 112> InstructionFormatMIMG = {{
     {InstClass::VectorMemImgSmp, InstCategory::VectorMemory, 4, 1, ScalarType::Uint32,
      ScalarType::Float32},
     // 88 = IMAGE_GATHER4_C_O
-    {InstClass::VectorMemImgSmp, InstCategory::VectorMemory, 4, 1, ScalarType::Undefined,
-     ScalarType::Undefined},
+    {InstClass::VectorMemImgSmp, InstCategory::VectorMemory, 4, 1, ScalarType::Uint32,
+     ScalarType::Float32},
     // 89 = IMAGE_GATHER4_C_CL_O
     {InstClass::VectorMemImgSmp, InstCategory::VectorMemory, 4, 1, ScalarType::Undefined,
      ScalarType::Undefined},
diff --git a/src/shader_recompiler/frontend/translate/vector_memory.cpp b/src/shader_recompiler/frontend/translate/vector_memory.cpp
index 7ecc2e762..c0957c3d1 100644
--- a/src/shader_recompiler/frontend/translate/vector_memory.cpp
+++ b/src/shader_recompiler/frontend/translate/vector_memory.cpp
@@ -144,6 +144,7 @@ void Translator::EmitVectorMemory(const GcnInst& inst) {
         // Image gather operations
     case Opcode::IMAGE_GATHER4_LZ:
     case Opcode::IMAGE_GATHER4_C:
+    case Opcode::IMAGE_GATHER4_C_O:
     case Opcode::IMAGE_GATHER4_C_LZ:
     case Opcode::IMAGE_GATHER4_LZ_O:
         return IMAGE_GATHER(inst);