octo/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

renderer_vulkan: Batch allocate descriptor sets

Browse Source 
* Less driver calls should lead to better performance
This commit is contained in:
emufan4568
2022-10-16 11:03:48 +03:00
committed by GPUCode
parent 489bbb98b2
commit dd3d24bfec
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
View File

@ -19,6 +19,7 @@ struct Bindings {
u32 binding_count; u32 binding_count;
}; };
constexpr u32 DESCRIPTOR_BATCH_SIZE = 8;
constexpr u32 RASTERIZER_SET_COUNT = 4; constexpr u32 RASTERIZER_SET_COUNT = 4;
constexpr static std::array RASTERIZER_SETS = { constexpr static std::array RASTERIZER_SETS = {
Bindings{// Utility set Bindings{// Utility set
@ -289,6 +290,9 @@ void PipelineCache::MarkDirty() {
descriptor_dirty.fill(true); descriptor_dirty.fill(true);
current_pipeline = VK_NULL_HANDLE; current_pipeline = VK_NULL_HANDLE;
state_dirty = true; state_dirty = true;
for (auto& batch : descriptor_batch) {
batch.clear();
}
} }
void PipelineCache::ApplyDynamic(const PipelineInfo& info) { void PipelineCache::ApplyDynamic(const PipelineInfo& info) {
@ -585,18 +589,27 @@ static_assert(sizeof(vk::DescriptorBufferInfo) == sizeof(VkDescriptorBufferInfo)
void PipelineCache::BindDescriptorSets() { void PipelineCache::BindDescriptorSets() {
vk::Device device = instance.GetDevice(); vk::Device device = instance.GetDevice();
std::array<vk::DescriptorSetLayout, DESCRIPTOR_BATCH_SIZE> layouts;
for (u32 i = 0; i < RASTERIZER_SET_COUNT; i++) { for (u32 i = 0; i < RASTERIZER_SET_COUNT; i++) {
if (descriptor_dirty[i] || !descriptor_sets[i]) { if (descriptor_dirty[i] || !descriptor_sets[i]) {
auto& batch = descriptor_batch[i];
if (batch.empty()) {
layouts.fill(descriptor_set_layouts[i]);
const vk::DescriptorSetAllocateInfo alloc_info = { const vk::DescriptorSetAllocateInfo alloc_info = {
.descriptorPool = scheduler.GetDescriptorPool(), .descriptorPool = scheduler.GetDescriptorPool(),
.descriptorSetCount = 1, .descriptorSetCount = DESCRIPTOR_BATCH_SIZE,
.pSetLayouts = &descriptor_set_layouts[i]}; .pSetLayouts = layouts.data()};
vk::DescriptorSet set = device.allocateDescriptorSets(alloc_info)[0]; batch = device.allocateDescriptorSets(alloc_info);
}
vk::DescriptorSet set = batch.back();
device.updateDescriptorSetWithTemplate(set, update_templates[i], update_data[i][0]); device.updateDescriptorSetWithTemplate(set, update_templates[i], update_data[i][0]);
descriptor_sets[i] = set; descriptor_sets[i] = set;
descriptor_dirty[i] = false; descriptor_dirty[i] = false;
batch.pop_back();
} }
} }

1
src/video_core/renderer_vulkan/vk_pipeline_cache.h
View File

@ -243,6 +243,7 @@ private:
std::array<DescriptorSetData, MAX_DESCRIPTOR_SETS> update_data{}; std::array<DescriptorSetData, MAX_DESCRIPTOR_SETS> update_data{};
std::array<bool, MAX_DESCRIPTOR_SETS> descriptor_dirty{}; std::array<bool, MAX_DESCRIPTOR_SETS> descriptor_dirty{};
std::array<vk::DescriptorSet, MAX_DESCRIPTOR_SETS> descriptor_sets; std::array<vk::DescriptorSet, MAX_DESCRIPTOR_SETS> descriptor_sets;
std::array<std::vector<vk::DescriptorSet>, MAX_DESCRIPTOR_SETS> descriptor_batch;
bool state_dirty = true; bool state_dirty = true;
// Bound shader modules // Bound shader modules