Merge a7caa07fdd into 15e6e48bef

src/shader_recompiler/ir_opt/texture_pass.cpp

@@ -558,14 +558,6 @@ void TexturePass(Environment& env, IR::Program& program, const HostTranslateInfo
             flags.type.Assign(ReadTextureType(env, cbuf));
             inst->SetFlags(flags);
             break;
-        case IR::Opcode::ImageSampleImplicitLod:
-            if (flags.type != TextureType::Color2D) {
-                break;
-            }
-            if (ReadTextureType(env, cbuf) == TextureType::Color2DRect) {
-                PatchImageSampleImplicitLod(*texture_inst.block, *texture_inst.inst);
-            }
-            break;
         case IR::Opcode::ImageFetch:
             if (flags.type == TextureType::Color2D || flags.type == TextureType::Color2DRect ||
                 flags.type == TextureType::ColorArray2D) {
@@ -685,6 +677,19 @@ void TexturePass(Environment& env, IR::Program& program, const HostTranslateInfo
                 PatchTexelFetch(*texture_inst.block, *texture_inst.inst, pixel_format);
             }
         }
+
+        switch (inst->GetOpcode()) {
+        case IR::Opcode::ImageSampleImplicitLod:
+            if (flags.type != TextureType::Color2D) {
+                break;
+            }
+            if (ReadTextureType(env, cbuf) == TextureType::Color2DRect) {
+                PatchImageSampleImplicitLod(*texture_inst.block, *texture_inst.inst);
+            }
+            break;
+        default:
+            break;
+        }
     }
 }