Mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-06-06 18:53:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

renderer_vulkan: Bind descriptors to specific stages in layout. (#2458)

Browse source
This commit is contained in:
squidbus 2025-02-16 05:08:16 -08:00 • committed by GitHub
parent 26bb3d40d9
commit e13fb2e366
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp
View file

@ -19,6 +19,15 @@ namespace Vulkan {
using Shader::Backend::SPIRV::AuxShaderType; using Shader::Backend::SPIRV::AuxShaderType;
static constexpr std::array LogicalStageToStageBit = {
vk::ShaderStageFlagBits::eFragment,
vk::ShaderStageFlagBits::eTessellationControl,
vk::ShaderStageFlagBits::eTessellationEvaluation,
vk::ShaderStageFlagBits::eVertex,
vk::ShaderStageFlagBits::eGeometry,
vk::ShaderStageFlagBits::eCompute,
};
GraphicsPipeline::GraphicsPipeline( GraphicsPipeline::GraphicsPipeline(
const Instance& instance, Scheduler& scheduler, DescriptorHeap& desc_heap, const Instance& instance, Scheduler& scheduler, DescriptorHeap& desc_heap,
const Shader::Profile& profile, const GraphicsPipelineKey& key_, const Shader::Profile& profile, const GraphicsPipelineKey& key_,
@ -34,7 +43,7 @@ GraphicsPipeline::GraphicsPipeline(
const auto debug_str = GetDebugString(); const auto debug_str = GetDebugString();
const vk::PushConstantRange push_constants = { const vk::PushConstantRange push_constants = {
.stageFlags = gp_stage_flags, .stageFlags = AllGraphicsStageBits,
.offset = 0, .offset = 0,
.size = sizeof(Shader::PushData), .size = sizeof(Shader::PushData),
}; };
@ -352,6 +361,7 @@ void GraphicsPipeline::BuildDescSetLayout() {
if (!stage) { if (!stage) {
continue; continue;
} }
const auto stage_bit = LogicalStageToStageBit[u32(stage->l_stage)];
for (const auto& buffer : stage->buffers) { for (const auto& buffer : stage->buffers) {
const auto sharp = buffer.GetSharp(*stage); const auto sharp = buffer.GetSharp(*stage);
bindings.push_back({ bindings.push_back({
@ -360,7 +370,7 @@ void GraphicsPipeline::BuildDescSetLayout() {
? vk::DescriptorType::eStorageBuffer ? vk::DescriptorType::eStorageBuffer
: vk::DescriptorType::eUniformBuffer, : vk::DescriptorType::eUniformBuffer,
.descriptorCount = 1, .descriptorCount = 1,
.stageFlags = gp_stage_flags, .stageFlags = stage_bit,
}); });
} }
for (const auto& image : stage->images) { for (const auto& image : stage->images) {
@ -369,7 +379,7 @@ void GraphicsPipeline::BuildDescSetLayout() {
.descriptorType = image.is_written ? vk::DescriptorType::eStorageImage .descriptorType = image.is_written ? vk::DescriptorType::eStorageImage
: vk::DescriptorType::eSampledImage, : vk::DescriptorType::eSampledImage,
.descriptorCount = 1, .descriptorCount = 1,
.stageFlags = gp_stage_flags, .stageFlags = stage_bit,
}); });
} }
for (const auto& sampler : stage->samplers) { for (const auto& sampler : stage->samplers) {
@ -377,7 +387,7 @@ void GraphicsPipeline::BuildDescSetLayout() {
.binding = binding++, .binding = binding++,
.descriptorType = vk::DescriptorType::eSampler, .descriptorType = vk::DescriptorType::eSampler,
.descriptorCount = 1, .descriptorCount = 1,
.stageFlags = gp_stage_flags, .stageFlags = stage_bit,
}); });
} }
} }

2
src/video_core/renderer_vulkan/vk_pipeline_common.cpp
View file

@ -37,7 +37,7 @@ void Pipeline::BindResources(DescriptorWrites& set_writes, const BufferBarriers&
cmdbuf.pipelineBarrier2(dependencies); cmdbuf.pipelineBarrier2(dependencies);
} }
const auto stage_flags = IsCompute() ? vk::ShaderStageFlagBits::eCompute : gp_stage_flags; const auto stage_flags = IsCompute() ? vk::ShaderStageFlagBits::eCompute : AllGraphicsStageBits;
cmdbuf.pushConstants(*pipeline_layout, stage_flags, 0u, sizeof(push_data), &push_data); cmdbuf.pushConstants(*pipeline_layout, stage_flags, 0u, sizeof(push_data), &push_data);
// Bind descriptor set. // Bind descriptor set.

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

@ -15,7 +15,7 @@ class BufferCache;
namespace Vulkan { namespace Vulkan {
static constexpr auto gp_stage_flags = static constexpr auto AllGraphicsStageBits =
vk::ShaderStageFlagBits::eVertex | vk::ShaderStageFlagBits::eTessellationControl | vk::ShaderStageFlagBits::eVertex | vk::ShaderStageFlagBits::eTessellationControl |
vk::ShaderStageFlagBits::eTessellationEvaluation | vk::ShaderStageFlagBits::eGeometry | vk::ShaderStageFlagBits::eTessellationEvaluation | vk::ShaderStageFlagBits::eGeometry |
vk::ShaderStageFlagBits::eFragment; vk::ShaderStageFlagBits::eFragment;