The-Homebrew-Cloud/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2024-12-24 02:21:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Keep track of more pipeline descriptor information

Browse Source 
This is needed in order to allow allocating per-draw descriptor arrays without recounting their lengths each time
This commit is contained in:
Billy Laws 2022-09-15 22:27:35 +01:00
parent ad0275dbef
commit 25255b01c7
2 changed files with 38 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
app/src/main/cpp/skyline/gpu/interconnect/maxwell_3d/pipeline_manager.cpp
View File

@ -216,14 +216,18 @@ namespace skyline::gpu::interconnect::maxwell3d {
return shaderStages; return shaderStages;
} }
static std::vector<vk::DescriptorSetLayoutBinding> MakePipelineDescriptorSetLayoutBindings(const std::array<Pipeline::ShaderStage, engine::ShaderStageCount> &shaderStages) { static Pipeline::DescriptorInfo MakePipelineDescriptorInfo(const std::array<Pipeline::ShaderStage, engine::ShaderStageCount> &shaderStages, bool needsIndividualTextureBindingWrites) {
std::vector<vk::DescriptorSetLayoutBinding> layoutBindings; Pipeline::DescriptorInfo descriptorInfo{};
u32 bindingIndex{}; u32 bindingIndex{};
for (const auto &stage : shaderStages) { for (const auto &stage : shaderStages) {
auto pushBindings{[&](vk::DescriptorType type, const auto &descs) { auto pushBindings{[&](vk::DescriptorType type, const auto &descs, u32 &count, bool individualDescWrites = false) {
descriptorInfo.writeDescCount += individualDescWrites ? descs.size() : ((descs.size() > 0) ? 1 : 0);
for (const auto &desc : descs) { for (const auto &desc : descs) {
layoutBindings.push_back(vk::DescriptorSetLayoutBinding{ count += desc.count;
descriptorInfo.descriptorSetLayoutBindings.push_back(vk::DescriptorSetLayoutBinding{
.binding = bindingIndex++, .binding = bindingIndex++,
.descriptorType = type, .descriptorType = type,
.descriptorCount = desc.count, .descriptorCount = desc.count,
@ -232,15 +236,20 @@ namespace skyline::gpu::interconnect::maxwell3d {
} }
}}; }};
pushBindings(vk::DescriptorType::eUniformBuffer, stage.info.constant_buffer_descriptors); pushBindings(vk::DescriptorType::eUniformBuffer, stage.info.constant_buffer_descriptors, descriptorInfo.uniformBufferDescCount);
pushBindings(vk::DescriptorType::eStorageBuffer, stage.info.storage_buffers_descriptors); pushBindings(vk::DescriptorType::eStorageBuffer, stage.info.storage_buffers_descriptors, descriptorInfo.storageBufferDescCount);
pushBindings(vk::DescriptorType::eUniformTexelBuffer, stage.info.texture_buffer_descriptors); descriptorInfo.totalBufferDescCount += descriptorInfo.uniformBufferDescCount + descriptorInfo.storageBufferDescCount;
pushBindings(vk::DescriptorType::eStorageTexelBuffer, stage.info.image_buffer_descriptors);
pushBindings(vk::DescriptorType::eCombinedImageSampler, stage.info.texture_descriptors); pushBindings(vk::DescriptorType::eUniformTexelBuffer, stage.info.texture_buffer_descriptors, descriptorInfo.uniformTexelBufferDescCount);
pushBindings(vk::DescriptorType::eStorageImage, stage.info.image_descriptors); pushBindings(vk::DescriptorType::eStorageTexelBuffer, stage.info.image_buffer_descriptors, descriptorInfo.storageTexelBufferDescCount);
descriptorInfo.totalTexelBufferDescCount += descriptorInfo.uniformTexelBufferDescCount + descriptorInfo.storageTexelBufferDescCount;
pushBindings(vk::DescriptorType::eCombinedImageSampler, stage.info.texture_descriptors, descriptorInfo.combinedImageSamplerDescCount, needsIndividualTextureBindingWrites);
pushBindings(vk::DescriptorType::eStorageImage, stage.info.image_descriptors, descriptorInfo.storageImageDescCount);
descriptorInfo.totalImageDescCount += descriptorInfo.combinedImageSamplerDescCount + descriptorInfo.storageImageDescCount;
} }
return layoutBindings; return descriptorInfo;
} }
static vk::Format ConvertVertexInputAttributeFormat(engine::VertexAttribute::ComponentBitWidths componentBitWidths, engine::VertexAttribute::NumericalType numericalType) { static vk::Format ConvertVertexInputAttributeFormat(engine::VertexAttribute::ComponentBitWidths componentBitWidths, engine::VertexAttribute::NumericalType numericalType) {
@ -504,9 +513,10 @@ namespace skyline::gpu::interconnect::maxwell3d {
Pipeline::Pipeline(InterconnectContext &ctx, const PackedPipelineState &packedState, const std::array<ShaderBinary, engine::PipelineCount> &shaderBinaries, span<TextureView *> colorAttachments, TextureView *depthAttachment) Pipeline::Pipeline(InterconnectContext &ctx, const PackedPipelineState &packedState, const std::array<ShaderBinary, engine::PipelineCount> &shaderBinaries, span<TextureView *> colorAttachments, TextureView *depthAttachment)
: shaderStages{MakePipelineShaders(ctx, packedState, shaderBinaries)}, : shaderStages{MakePipelineShaders(ctx, packedState, shaderBinaries)},
descriptorSetLayoutBindings{MakePipelineDescriptorSetLayoutBindings(shaderStages)}, descriptorInfo{MakePipelineDescriptorInfo(shaderStages, ctx.gpu.traits.quirks.needsIndividualTextureBindingWrites)},
compiledPipeline{MakeCompiledPipeline(ctx, packedState, shaderStages, descriptorSetLayoutBindings, colorAttachments, depthAttachment)}, compiledPipeline{MakeCompiledPipeline(ctx, packedState, shaderStages, descriptorInfo.descriptorSetLayoutBindings, colorAttachments, depthAttachment)},
sourcePackedState{packedState} { sourcePackedState{packedState} {
storageBufferViews.resize(descriptorInfo.storageBufferDescCount);
} }
Pipeline *Pipeline::LookupNext(const PackedPipelineState &packedState) { Pipeline *Pipeline::LookupNext(const PackedPipelineState &packedState) {

16
app/src/main/cpp/skyline/gpu/interconnect/maxwell_3d/pipeline_manager.h
View File

@ -27,10 +27,24 @@ namespace skyline::gpu::interconnect::maxwell3d {
Shader::Info info; Shader::Info info;
}; };
struct DescriptorInfo {
std::vector<vk::DescriptorSetLayoutBinding> descriptorSetLayoutBindings;
u32 writeDescCount{};
u32 uniformBufferDescCount{};
u32 storageBufferDescCount{};
u32 totalBufferDescCount{};
u32 uniformTexelBufferDescCount{};
u32 storageTexelBufferDescCount{};
u32 totalTexelBufferDescCount{};
u32 combinedImageSamplerDescCount{};
u32 storageImageDescCount{};
u32 totalImageDescCount{};
};
private: private:
std::array<ShaderStage, engine::ShaderStageCount> shaderStages; std::array<ShaderStage, engine::ShaderStageCount> shaderStages;
std::vector<vk::DescriptorSetLayoutBinding> descriptorSetLayoutBindings;
cache::GraphicsPipelineCache::CompiledPipeline compiledPipeline; cache::GraphicsPipelineCache::CompiledPipeline compiledPipeline;
DescriptorInfo descriptorInfo;
std::array<Pipeline *, 4> transitionCache{}; std::array<Pipeline *, 4> transitionCache{};
size_t transitionCacheNextIdx{}; size_t transitionCacheNextIdx{};