From 652892d027dfe42331f5c9d51b3f148af52d8e10 Mon Sep 17 00:00:00 2001
From: Frodo Baggins <baggins31084@proton.me>
Date: Sat, 7 Dec 2024 23:25:42 -0800
Subject: [PATCH] rebase fixes

---
 src/shader_recompiler/ir/microinstruction.cpp          | 1 -
 src/video_core/renderer_vulkan/vk_compute_pipeline.cpp | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/shader_recompiler/ir/microinstruction.cpp b/src/shader_recompiler/ir/microinstruction.cpp
index 7e0481f12..21b9f048e 100644
--- a/src/shader_recompiler/ir/microinstruction.cpp
+++ b/src/shader_recompiler/ir/microinstruction.cpp
@@ -154,7 +154,6 @@ void Inst::AddPhiOperand(Block* predecessor, const Value& value) {
 
 void Inst::Invalidate() {
     ClearArgs();
-    ASSERT(users.list.empty());
     ReplaceOpcode(Opcode::Void);
 }
 
diff --git a/src/video_core/renderer_vulkan/vk_compute_pipeline.cpp b/src/video_core/renderer_vulkan/vk_compute_pipeline.cpp
index 8d495ab06..a39b18378 100644
--- a/src/video_core/renderer_vulkan/vk_compute_pipeline.cpp
+++ b/src/video_core/renderer_vulkan/vk_compute_pipeline.cpp
@@ -16,7 +16,7 @@ ComputePipeline::ComputePipeline(const Instance& instance_, Scheduler& scheduler
                                  ComputePipelineKey compute_key_, const Shader::Info& info_,
                                  vk::ShaderModule module)
     : Pipeline{instance_, scheduler_, desc_heap_, pipeline_cache, true}, compute_key{compute_key_} {
-    auto& info = stages[int(Shader::Stage::Compute)];
+    auto& info = stages[int(Shader::LogicalStage::Compute)];
     info = &info_;
 
     const vk::PipelineShaderStageCreateInfo shader_ci = {