mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-08-04 16:32:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

rebase fix

Browse Source
This commit is contained in:
Frodo Baggins 2024-11-29 23:07:30 -08:00
parent b66db74c61
commit 256ee8f7a0
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp
View File

@ -8,6 +8,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"
@ -19,6 +20,8 @@
namespace Vulkan {
using Shader::LogicalStage; // TODO
GraphicsPipeline::GraphicsPipeline(const Instance& instance_, Scheduler& scheduler_,
DescriptorHeap& desc_heap_, const GraphicsPipelineKey& key_,
vk::PipelineCache pipeline_cache,

2
src/video_core/renderer_vulkan/vk_pipeline_common.h
View File

@ -44,7 +44,7 @@ public:
}
}
const Shader::Info& GetStage(Shader::Stage stage) const noexcept {
const Shader::Info& GetStage(Shader::LogicalStage stage) const noexcept {
return *stages[u32(stage)];
}

2
src/video_core/renderer_vulkan/vk_rasterizer.cpp
View File

@ -388,7 +388,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