preserve-emulation/simple64
1
0 Fork 0
mirror of https://github.com/simple64/simple64.git synced 2026-11-14 14:18:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

update parallel rdp

Browse Source
This commit is contained in:
Logan McNaughton committed 2022-05-29 18:33:47 -06:00
1 parent 37f61aef57
commit b96f789d1a
108 files changed
+58317 -109283
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

parallel-rdp-standalone/vulkan/descriptor_set.cpp
+15 -20
View File
@@ -1,4 +1,4 @@
/* Copyright (c) 2017-2020 Hans-Kristian Arntzen
/* Copyright (c) 2017-2022 Hans-Kristian Arntzen
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
@@ -65,10 +65,8 @@ DescriptorSetAllocator::DescriptorSetAllocator(Hash hash, Device *device_, const
flags.bindingCount = 1;
flags.pBindingFlags = &binding_flags;
binding_flags = VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT_EXT |
VK_DESCRIPTOR_BINDING_UPDATE_AFTER_BIND_BIT_EXT;
if (device->get_device_features().descriptor_indexing_features.descriptorBindingVariableDescriptorCount)
binding_flags |= VK_DESCRIPTOR_BINDING_VARIABLE_DESCRIPTOR_COUNT_BIT_EXT;
VK_DESCRIPTOR_BINDING_UPDATE_AFTER_BIND_BIT_EXT |
VK_DESCRIPTOR_BINDING_VARIABLE_DESCRIPTOR_COUNT_BIT_EXT;
}
for (unsigned i = 0; i < VULKAN_NUM_BINDINGS; i++)
@@ -83,8 +81,6 @@ DescriptorSetAllocator::DescriptorSetAllocator(Hash hash, Device *device_, const
{
array_size = VULKAN_NUM_BINDINGS_BINDLESS_VARYING;
pool_array_size = array_size;
if (!device->get_device_features().descriptor_indexing_features.descriptorBindingVariableDescriptorCount)
LOGW("Device does not support variable descriptor count.\n");
}
else
pool_array_size = array_size * VULKAN_NUM_SETS_PER_POOL;
@@ -101,13 +97,20 @@ DescriptorSetAllocator::DescriptorSetAllocator(Hash hash, Device *device_, const
types++;
}
if (layout.sampled_buffer_mask & (1u << i))
if (layout.sampled_texel_buffer_mask & (1u << i))
{
bindings.push_back({ i, VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER, array_size, stages, nullptr });
pool_size.push_back({ VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER, pool_array_size });
types++;
}
if (layout.storage_texel_buffer_mask & (1u << i))
{
bindings.push_back({ i, VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER, array_size, stages, nullptr });
pool_size.push_back({ VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER, pool_array_size });
types++;
}
if (layout.storage_image_mask & (1u << i))
{
bindings.push_back({ i, VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, array_size, stages, nullptr });
@@ -199,12 +202,9 @@ VkDescriptorSet DescriptorSetAllocator::allocate_bindless_set(VkDescriptorPool p
{ VK_STRUCTURE_TYPE_DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_ALLOCATE_INFO_EXT };
uint32_t num_desc = num_descriptors;
if (device->get_device_features().descriptor_indexing_features.descriptorBindingVariableDescriptorCount)
{
count_info.descriptorSetCount = 1;
count_info.pDescriptorCounts = &num_desc;
info.pNext = &count_info;
}
count_info.descriptorSetCount = 1;
count_info.pDescriptorCounts = &num_desc;
info.pNext = &count_info;
VkDescriptorSet desc_set = VK_NULL_HANDLE;
if (table.vkAllocateDescriptorSets(device->get_device(), &info, &desc_set) != VK_SUCCESS)
@@ -231,12 +231,7 @@ VkDescriptorPool DescriptorSetAllocator::allocate_bindless_pool(unsigned num_set
return VK_NULL_HANDLE;
}
// If implementation does not support variable descriptor count, allocate maximum.
if (device->get_device_features().descriptor_indexing_features.descriptorBindingVariableDescriptorCount)
size.descriptorCount = num_descriptors;
else
info.maxSets = 1;
size.descriptorCount = num_descriptors;
info.pPoolSizes = &size;
if (table.vkCreateDescriptorPool(device->get_device(), &info, nullptr, &pool) != VK_SUCCESS)