Skip to content

Commit cfe15e5

Browse files
authored
Merge branch 'shadps4-emu:main' into main
2 parents 458693b + aba803b commit cfe15e5

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/shader_recompiler/frontend/format.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3642,8 +3642,8 @@ constexpr std::array<InstFormat, 112> InstructionFormatMIMG = {{
36423642
{InstClass::VectorMemImgSmp, InstCategory::VectorMemory, 4, 1, ScalarType::Undefined,
36433643
ScalarType::Undefined},
36443644
// 95 = IMAGE_GATHER4_C_LZ_O
3645-
{InstClass::VectorMemImgSmp, InstCategory::VectorMemory, 4, 1, ScalarType::Undefined,
3646-
ScalarType::Undefined},
3645+
{InstClass::VectorMemImgSmp, InstCategory::VectorMemory, 4, 1, ScalarType::Uint32,
3646+
ScalarType::Float32},
36473647
// 96 = IMAGE_GET_LOD
36483648
{InstClass::VectorMemImgUt, InstCategory::VectorMemory, 4, 1, ScalarType::Float32,
36493649
ScalarType::Float32},

src/shader_recompiler/frontend/translate/vector_memory.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ void Translator::EmitVectorMemory(const GcnInst& inst) {
147147
case Opcode::IMAGE_GATHER4_C_O:
148148
case Opcode::IMAGE_GATHER4_C_LZ:
149149
case Opcode::IMAGE_GATHER4_LZ_O:
150+
case Opcode::IMAGE_GATHER4_C_LZ_O:
150151
return IMAGE_GATHER(inst);
151152

152153
// Image misc operations

0 commit comments

Comments
 (0)