another rebase

Author: baggins183

src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp

@@ -7,6 +7,7 @@
 
 #include "common/assert.h"
 #include "common/scope_exit.h"
+#include "shader_recompiler/runtime_info.h"
 #include "video_core/amdgpu/resource.h"
 #include "video_core/buffer_cache/buffer_cache.h"
 #include "video_core/renderer_vulkan/vk_graphics_pipeline.h"
@@ -16,6 +17,8 @@
 
 namespace Vulkan {
 
+using Shader::LogicalStage; // TODO
+
 GraphicsPipeline::GraphicsPipeline(const Instance& instance_, Scheduler& scheduler_,
                                    DescriptorHeap& desc_heap_, const GraphicsPipelineKey& key_,
                                    vk::PipelineCache pipeline_cache,

src/video_core/renderer_vulkan/vk_pipeline_common.h

@@ -14,9 +14,10 @@ class BufferCache;
 
 namespace Vulkan {
 
-static constexpr auto gp_stage_flags = vk::ShaderStageFlagBits::eVertex |
-                                       vk::ShaderStageFlagBits::eGeometry |
-                                       vk::ShaderStageFlagBits::eFragment;
+static constexpr auto gp_stage_flags =
+    vk::ShaderStageFlagBits::eVertex | vk::ShaderStageFlagBits::eTessellationControl |
+    vk::ShaderStageFlagBits::eTessellationEvaluation | vk::ShaderStageFlagBits::eGeometry |
+    vk::ShaderStageFlagBits::eFragment;
 
 class Instance;
 class Scheduler;
@@ -44,7 +45,7 @@ class Pipeline {
         }
     }
 
-    const Shader::Info& GetStage(Shader::Stage stage) const noexcept {
+    const Shader::Info& GetStage(Shader::LogicalStage stage) const noexcept {
         return *stages[u32(stage)];
     }
 

src/video_core/renderer_vulkan/vk_rasterizer.cpp

@@ -350,7 +350,7 @@ bool Rasterizer::BindResources(const Pipeline* pipeline) {
     const auto& regs = liverpool->regs;
 
     if (pipeline->IsCompute()) {
-        const auto& info = pipeline->GetStage(Shader::Stage::Compute);
+        const auto& info = pipeline->GetStage(Shader::LogicalStage::Compute);
 
         // Most of the time when a metadata is updated with a shader it gets cleared. It means
         // we can skip the whole dispatch and update the tracked state instead. Also, it is not