mirror of
https://github.com/scp-fs2open/fs2open.github.com.git
synced 2026-11-09 04:49:39 -10:00
The shadow-mapped path's penumbra width was a fixed per-cascade value (shadow_smoothness_scale()'s ceiling), so every occluder blurred its shadow by the same amount regardless of how close it actually was to the receiver -- unlike the raytraced path, which gets that for free from traceShadowRayCone()'s real occluder distance. Close that gap with PCSS: search nearby texels for occluders, then scale the filter radius by how far away they were. The blocker search (pcssBlockerSearch() in shadows.sdr) needs raw, uncompared depth reads, which the existing PCF sampler can't do -- it's bound with a compare mode for the hardware shadow-compare instructions the filtered sampling itself relies on. So shadow maps now get a second sampler, shadow_map_raw, bound to the same texture with compare mode off; on OpenGL that needs a second sampler object and GL 3.3 (shadow_contact_hardening_supported()), Vulkan can always bind it. Where the raw sampler isn't available, or the new Graphics.ShadowContactHardening option is off, shadows_start_render() sets Shadow_penumbra_scale[cascade] to -1 as a sentinel and pcssPenumbraRadius() (shadows.sdr) falls straight back to the fixed radius, bit-identical to the pre-contact-hardening behavior and skipping the extra texture reads. When it is on, shadows_start_render() computes each cascade's penumbra scale from its own frustum extents and the sun's tanθ; the shader turns that plus the blocker search's average depth into a per-pixel radius, clamped to [1 texel, the old fixed ceiling]. A blocker search that finds nothing doesn't fall back to "no shadow" -- a sparse 8-tap search can miss a thin occluder, so it instead runs the full filter at the hardest (1-texel) radius, trading a touch of extra blur for not popping a real shadow to nothing. Drops RT_SHADOW_SUN_SIZE_CALIBRATION accordingly: that constant existed only to fake a blocker-distance-driven penumbra on the shadow-mapped path by pre-scaling the raytraced cone to match it, and the shadow-mapped path now has a real blocker search of its own, so the raytraced cone goes back to its physically correct size.
535 lines
20 KiB
C++
535 lines
20 KiB
C++
#include "VulkanDescriptorManager.h"
|
|
#include "VulkanBuffer.h"
|
|
#include "VulkanTexture.h"
|
|
#include "VulkanRaytracing.h"
|
|
|
|
|
|
namespace graphics::vulkan {
|
|
|
|
// ========== Static set templates ==========
|
|
|
|
static constexpr DescriptorBindingTemplate s_globalBindings[] = {
|
|
{GlobalBinding::Lights, vk::DescriptorType::eUniformBuffer, 1, vk::ShaderStageFlagBits::eVertex | vk::ShaderStageFlagBits::eFragment},
|
|
{GlobalBinding::DeferredData, vk::DescriptorType::eUniformBuffer, 1, vk::ShaderStageFlagBits::eVertex | vk::ShaderStageFlagBits::eFragment},
|
|
{GlobalBinding::ShadowMap, vk::DescriptorType::eCombinedImageSampler, 1, vk::ShaderStageFlagBits::eFragment, vk::ImageViewType::e2DArray},
|
|
{GlobalBinding::EnvMap, vk::DescriptorType::eCombinedImageSampler, 1, vk::ShaderStageFlagBits::eFragment, vk::ImageViewType::eCube},
|
|
{GlobalBinding::IrradianceMap, vk::DescriptorType::eCombinedImageSampler, 1, vk::ShaderStageFlagBits::eFragment, vk::ImageViewType::eCube},
|
|
{GlobalBinding::ShadowCascadeParams, vk::DescriptorType::eUniformBuffer, 1, vk::ShaderStageFlagBits::eVertex | vk::ShaderStageFlagBits::eFragment},
|
|
{GlobalBinding::ShadowMapRaw, vk::DescriptorType::eCombinedImageSampler, 1, vk::ShaderStageFlagBits::eFragment, vk::ImageViewType::e2DArray},
|
|
};
|
|
static constexpr DescriptorBindingTemplate s_globalTlasBinding{
|
|
GlobalBinding::Tlas, vk::DescriptorType::eAccelerationStructureKHR, 1, vk::ShaderStageFlagBits::eFragment};
|
|
|
|
// GLOBAL_DYNAMIC_OFFSET_COUNT is stated rather than derived because this set's template is
|
|
// assembled at runtime (see below); keep the two in agreement. The optional TLAS binding is not
|
|
// a dynamic UBO, so it cannot change the count either.
|
|
static_assert(dynamic_offset_count(s_globalBindings) == GLOBAL_DYNAMIC_OFFSET_COUNT,
|
|
"The Global set gained a dynamic binding; GLOBAL_DYNAMIC_OFFSET_COUNT must follow.");
|
|
|
|
// The Global set's layout must omit the TLAS binding entirely on devices without
|
|
// VK_KHR_acceleration_structure enabled -- a descriptor type the device didn't
|
|
// enable the extension for is invalid in vkCreateDescriptorSetLayout. So, unlike
|
|
// the other set templates, the Global template is assembled at runtime in
|
|
// createSetLayouts() based on the raytracingSupported flag passed to init(), into
|
|
// the per-instance m_globalBindingsRuntime/m_globalTemplateRuntime members
|
|
// (see VulkanDescriptorManager.h), rather than compiled in as a fixed constexpr array.
|
|
|
|
// The binding declarations themselves live in the header (MaterialSetBindings /
|
|
// PerDrawSetBindings) because the dynamic-offset layout is derived from them there.
|
|
static constexpr DescriptorSetTemplate s_materialTemplate(MaterialSetBindings);
|
|
static constexpr DescriptorSetTemplate s_perDrawTemplate(PerDrawSetBindings);
|
|
|
|
// ========== Static uniform binding mappings ==========
|
|
|
|
static constexpr VulkanDescriptorManager::UniformBindingEntry s_globalUBOs[] = {
|
|
{GlobalBinding::Lights, uniform_block_type::Lights},
|
|
{GlobalBinding::DeferredData, uniform_block_type::DeferredGlobals},
|
|
{GlobalBinding::ShadowCascadeParams, uniform_block_type::ShadowCascadeParams},
|
|
};
|
|
|
|
static constexpr VulkanDescriptorManager::UniformBindingEntry s_materialUBOs[] = {
|
|
{MaterialBinding::ModelData, uniform_block_type::ModelData},
|
|
{MaterialBinding::DecalGlobals, uniform_block_type::DecalGlobals},
|
|
};
|
|
// Note: MaterialBinding::ShadowMapData is intentionally NOT in s_materialUBOs --
|
|
// unlike ModelData/DecalGlobals, shadow_render_list passes its UBO handle/offset/size
|
|
// directly into gr_render_shadow_draw() rather than through gr_bind_uniform_buffer(),
|
|
// so VulkanDrawManager::renderShadowDraw() binds it explicitly instead of relying on
|
|
// the generic pending-uniform-binding pass in applyMaterial().
|
|
|
|
static constexpr VulkanDescriptorManager::UniformBindingEntry s_perDrawUBOs[] = {
|
|
{PerDrawBinding::GenericData, uniform_block_type::GenericData},
|
|
{PerDrawBinding::Matrices, uniform_block_type::Matrices},
|
|
{PerDrawBinding::NanoVGData, uniform_block_type::NanoVGData},
|
|
{PerDrawBinding::DecalInfo, uniform_block_type::DecalInfo},
|
|
{PerDrawBinding::MovieData, uniform_block_type::MovieData},
|
|
};
|
|
|
|
|
|
// ========== DescriptorFallbacks ==========
|
|
|
|
const vk::DescriptorImageInfo& DescriptorFallbacks::getImage(vk::ImageViewType t) const
|
|
{
|
|
switch (t) {
|
|
case vk::ImageViewType::e2D: return texture2D;
|
|
case vk::ImageViewType::e2DArray: return texture2DArray;
|
|
case vk::ImageViewType::eCube: return textureCube;
|
|
case vk::ImageViewType::e3D: return texture3D;
|
|
default:
|
|
Assertion(false, "DescriptorFallbacks::getImage: unhandled ImageViewType %d", static_cast<int>(t));
|
|
return texture2D;
|
|
}
|
|
}
|
|
|
|
// ========== DescriptorWriter template-based methods ==========
|
|
|
|
void DescriptorWriter::writeSet(DescriptorSetIndex setIndex, vk::DescriptorSet set)
|
|
{
|
|
Assert(m_fallbacks);
|
|
|
|
const DescriptorSetTemplate& tmpl = VulkanDescriptorManager::getSetTemplate(setIndex);
|
|
|
|
// Clear binding slots for this set
|
|
m_bindingSlots = {};
|
|
m_currentSet = setIndex;
|
|
|
|
// Dynamic offsets are consumed in binding order, so assign slots as the template is walked
|
|
// (templates list bindings in ascending binding number). This must stay the same rule
|
|
// dynamic_offset_slot() applies — hence advancing by b.count, not by one binding.
|
|
uint32_t nextDynIndex = 0;
|
|
m_dynOffsets[static_cast<size_t>(setIndex)] = {};
|
|
|
|
for (const auto& b : tmpl) {
|
|
Assert(m_writeCount < MAX_WRITES);
|
|
Assert(b.binding < MAX_BINDINGS_PER_SET);
|
|
|
|
auto& w = m_writes[m_writeCount++];
|
|
w = vk::WriteDescriptorSet();
|
|
w.dstSet = set;
|
|
w.dstBinding = b.binding;
|
|
w.descriptorCount = b.count;
|
|
w.descriptorType = b.type;
|
|
|
|
auto& slot = m_bindingSlots[b.binding];
|
|
slot.count = b.count;
|
|
slot.viewType = b.viewType;
|
|
|
|
bool isImage = (b.type == vk::DescriptorType::eCombinedImageSampler);
|
|
bool isAccelStruct = (b.type == vk::DescriptorType::eAccelerationStructureKHR);
|
|
if (b.type == vk::DescriptorType::eUniformBufferDynamic) {
|
|
Assert(nextDynIndex + b.count <= MAX_DYNAMIC_OFFSETS_PER_SET);
|
|
slot.dynIndex = static_cast<int>(nextDynIndex);
|
|
nextDynIndex += b.count;
|
|
}
|
|
if (isImage) {
|
|
Assert(m_imageInfoCount + b.count <= MAX_IMAGE_INFOS);
|
|
auto* dst = &m_imageInfos[m_imageInfoCount];
|
|
const auto& fallbackImg = m_fallbacks->getImage(b.viewType);
|
|
for (uint32_t j = 0; j < b.count; ++j) {
|
|
dst[j] = fallbackImg;
|
|
}
|
|
w.pImageInfo = dst;
|
|
slot.imageInfo = dst;
|
|
m_imageInfoCount += b.count;
|
|
} else if (isAccelStruct) {
|
|
// No setAccelStruct() override step needed: m_fallbacks->shadowTlas IS
|
|
// the live value, kept fresh once per frame by setCurrentShadowTlas().
|
|
Assert(b.count == 1);
|
|
Assert(m_accelStructInfoCount < MAX_ACCEL_STRUCT_INFOS);
|
|
auto* dst = &m_accelStructInfos[m_accelStructInfoCount];
|
|
*dst = m_fallbacks->shadowTlas;
|
|
|
|
auto& asInfo = m_asWriteInfos[m_accelStructInfoCount];
|
|
asInfo = vk::WriteDescriptorSetAccelerationStructureKHR();
|
|
asInfo.accelerationStructureCount = 1;
|
|
asInfo.pAccelerationStructures = dst;
|
|
|
|
w.pNext = &asInfo;
|
|
m_accelStructInfoCount++;
|
|
} else {
|
|
Assert(m_bufferInfoCount < MAX_BUFFER_INFOS);
|
|
m_bufferInfos[m_bufferInfoCount] = m_fallbacks->buffer;
|
|
// The fallback buffer info starts at offset 0, which is also the base a
|
|
// dynamic descriptor needs (its offset lives in the dynamic-offset array,
|
|
// left at 0 here until setBuffer supplies a real one).
|
|
w.pBufferInfo = &m_bufferInfos[m_bufferInfoCount];
|
|
slot.bufferInfo = &m_bufferInfos[m_bufferInfoCount++];
|
|
}
|
|
}
|
|
}
|
|
|
|
void DescriptorWriter::bindSets(vk::CommandBuffer cmd,
|
|
vk::PipelineLayout layout,
|
|
DescriptorSetIndex firstSet,
|
|
ArrayView<vk::DescriptorSet> sets)
|
|
{
|
|
size_t out = 0;
|
|
for (size_t i = 0; i < sets.size; ++i) {
|
|
const auto set = static_cast<DescriptorSetIndex>(static_cast<uint32_t>(firstSet) + i);
|
|
Assert(static_cast<uint32_t>(set) < static_cast<uint32_t>(DescriptorSetIndex::Count));
|
|
|
|
const uint32_t dynCount = VulkanDescriptorManager::getDynamicOffsetCount(set);
|
|
Assert(dynCount <= MAX_DYNAMIC_OFFSETS_PER_SET);
|
|
for (uint32_t j = 0; j < dynCount; ++j) {
|
|
Assert(out < m_dynOffsetScratch.size());
|
|
m_dynOffsetScratch[out++] = m_dynOffsets[static_cast<size_t>(set)][j];
|
|
}
|
|
}
|
|
|
|
cmd.bindDescriptorSets(vk::PipelineBindPoint::eGraphics,
|
|
layout,
|
|
static_cast<uint32_t>(firstSet),
|
|
vk::ArrayProxy<const vk::DescriptorSet>(static_cast<uint32_t>(sets.size), sets.data),
|
|
vk::ArrayProxy<const uint32_t>(static_cast<uint32_t>(out), m_dynOffsetScratch.data()));
|
|
}
|
|
|
|
void DescriptorWriter::flush()
|
|
{
|
|
if (m_writeCount > 0) {
|
|
m_device.updateDescriptorSets(m_writeCount, m_writes.data(), 0, nullptr);
|
|
getDescriptorManager()->noteDescriptorWrites(m_writeCount);
|
|
}
|
|
m_writeCount = 0;
|
|
m_bufferInfoCount = 0;
|
|
m_imageInfoCount = 0;
|
|
m_accelStructInfoCount = 0;
|
|
}
|
|
|
|
void DescriptorWriter::setBuffer(uint32_t binding, const vk::DescriptorBufferInfo& info)
|
|
{
|
|
Assert(binding < MAX_BINDINGS_PER_SET);
|
|
auto& slot = m_bindingSlots[binding];
|
|
Assert(slot.bufferInfo);
|
|
|
|
if (slot.dynIndex >= 0) {
|
|
// Dynamic binding: the descriptor holds only {buffer, 0, range}; the caller's
|
|
// offset becomes the dynamic offset applied at bind time. Keeping it out of
|
|
// the descriptor is what lets the set survive an offset-only change.
|
|
auto& dyn = m_dynOffsets[static_cast<size_t>(m_currentSet)][static_cast<size_t>(slot.dynIndex)];
|
|
if (info.buffer) {
|
|
Assertion(info.offset <= static_cast<vk::DeviceSize>(UINT32_MAX),
|
|
"Dynamic uniform buffer offset " SIZE_T_ARG " does not fit in a uint32 dynamic offset!",
|
|
static_cast<size_t>(info.offset));
|
|
*slot.bufferInfo = vk::DescriptorBufferInfo(info.buffer, 0, info.range);
|
|
dyn = static_cast<uint32_t>(info.offset);
|
|
} else {
|
|
*slot.bufferInfo = m_fallbacks->buffer;
|
|
dyn = 0;
|
|
}
|
|
return;
|
|
}
|
|
|
|
if (info.buffer) {
|
|
*slot.bufferInfo = info;
|
|
} else {
|
|
*slot.bufferInfo = m_fallbacks->buffer;
|
|
}
|
|
}
|
|
|
|
void DescriptorWriter::setImage(uint32_t binding, const vk::DescriptorImageInfo& info)
|
|
{
|
|
Assert(binding < MAX_BINDINGS_PER_SET);
|
|
auto& slot = m_bindingSlots[binding];
|
|
Assert(slot.imageInfo);
|
|
if (info.imageView) {
|
|
*slot.imageInfo = info;
|
|
} else {
|
|
*slot.imageInfo = m_fallbacks->getImage(slot.viewType);
|
|
}
|
|
}
|
|
|
|
void DescriptorWriter::setImageArray(uint32_t binding, ArrayView<vk::DescriptorImageInfo> infos)
|
|
{
|
|
Assert(binding < MAX_BINDINGS_PER_SET);
|
|
auto& slot = m_bindingSlots[binding];
|
|
Assert(slot.imageInfo);
|
|
Assert(infos.size <= slot.count);
|
|
memcpy(slot.imageInfo, infos.data, infos.size * sizeof(vk::DescriptorImageInfo));
|
|
}
|
|
|
|
// ========== Global descriptor manager ==========
|
|
|
|
static VulkanDescriptorManager* g_descriptorManager = nullptr;
|
|
|
|
VulkanDescriptorManager* getDescriptorManager()
|
|
{
|
|
Assertion(g_descriptorManager != nullptr, "Vulkan DescriptorManager not initialized!");
|
|
return g_descriptorManager;
|
|
}
|
|
|
|
void setDescriptorManager(VulkanDescriptorManager* manager)
|
|
{
|
|
g_descriptorManager = manager;
|
|
}
|
|
|
|
bool VulkanDescriptorManager::init(vk::Device device, bool raytracingSupported)
|
|
{
|
|
if (m_initialized) {
|
|
return true;
|
|
}
|
|
|
|
m_device = device;
|
|
m_raytracingEnabled = raytracingSupported;
|
|
|
|
createSetLayouts();
|
|
createDescriptorPools();
|
|
|
|
m_initialized = true;
|
|
nprintf(("vulkan", "VulkanDescriptorManager: Initialized (raytraced shadows %s)\n",
|
|
m_raytracingEnabled ? "enabled" : "disabled"));
|
|
return true;
|
|
}
|
|
|
|
void VulkanDescriptorManager::shutdown()
|
|
{
|
|
if (!m_initialized) {
|
|
return;
|
|
}
|
|
|
|
// Wait for device idle before destroying
|
|
m_device.waitIdle();
|
|
|
|
// Destroy pools (automatically frees allocated sets)
|
|
for (auto& poolChain : m_framePools) {
|
|
poolChain.clear();
|
|
}
|
|
|
|
// Destroy layouts
|
|
for (auto& layout : m_setLayouts) {
|
|
layout.reset();
|
|
}
|
|
|
|
m_initialized = false;
|
|
nprintf(("vulkan", "VulkanDescriptorManager: Shutdown complete\n"));
|
|
}
|
|
|
|
void VulkanDescriptorManager::buildFallbacks(VulkanBufferManager* bufMgr, VulkanTextureManager* texMgr,
|
|
VulkanRaytracingManager* rtMgr)
|
|
{
|
|
m_fallbacks.buffer = bufMgr->getFallbackUniformBufferInfo();
|
|
m_fallbacks.texture2D = texMgr->getFallbackTextureInfo2D();
|
|
m_fallbacks.texture2DArray = texMgr->getFallbackTextureInfo2DArray();
|
|
m_fallbacks.textureCube = texMgr->getFallbackTextureInfoCube();
|
|
m_fallbacks.texture3D = texMgr->getFallbackTextureInfo3D();
|
|
if (m_raytracingEnabled && rtMgr != nullptr) {
|
|
// Seed with the permanent empty TLAS; setCurrentShadowTlas() takes over
|
|
// once the first real TLAS is built.
|
|
m_fallbacks.shadowTlas = rtMgr->getFallbackTlas();
|
|
}
|
|
nprintf(("vulkan", "VulkanDescriptorManager: Fallbacks built\n"));
|
|
}
|
|
|
|
const DescriptorSetTemplate& VulkanDescriptorManager::getSetTemplate(DescriptorSetIndex setIndex)
|
|
{
|
|
switch (setIndex) {
|
|
case DescriptorSetIndex::Global: return getDescriptorManager()->m_globalTemplateRuntime;
|
|
case DescriptorSetIndex::Material: return s_materialTemplate;
|
|
case DescriptorSetIndex::PerDraw: return s_perDrawTemplate;
|
|
default:
|
|
Assertion(false, "Invalid DescriptorSetIndex!");
|
|
return getDescriptorManager()->m_globalTemplateRuntime;
|
|
}
|
|
}
|
|
|
|
uint32_t VulkanDescriptorManager::getDynamicOffsetCount(DescriptorSetIndex setIndex)
|
|
{
|
|
// Constant per set (see the derived *_DYNAMIC_OFFSET_COUNT values), not a scan of the
|
|
// template — this runs on every descriptor set bind.
|
|
switch (setIndex) {
|
|
case DescriptorSetIndex::Global:
|
|
return GLOBAL_DYNAMIC_OFFSET_COUNT;
|
|
case DescriptorSetIndex::Material:
|
|
return MATERIAL_DYNAMIC_OFFSET_COUNT;
|
|
case DescriptorSetIndex::PerDraw:
|
|
return PERDRAW_DYNAMIC_OFFSET_COUNT;
|
|
default:
|
|
UNREACHABLE("Invalid descriptor set index %u!", static_cast<uint32_t>(setIndex));
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
vk::DescriptorSetLayout VulkanDescriptorManager::getSetLayout(DescriptorSetIndex setIndex) const
|
|
{
|
|
return m_setLayouts[static_cast<size_t>(setIndex)].get();
|
|
}
|
|
|
|
vk::DescriptorSet VulkanDescriptorManager::allocateFrameSet(DescriptorSetIndex setIndex)
|
|
{
|
|
if (!m_initialized) {
|
|
return {};
|
|
}
|
|
|
|
vk::DescriptorSetLayout layout = m_setLayouts[static_cast<size_t>(setIndex)].get();
|
|
auto& pools = m_framePools[m_currentFrame];
|
|
++m_setsAllocatedThisFrame;
|
|
|
|
// Allocate through the non-throwing, non-allocating vulkan.hpp overload: this is
|
|
// one of the hottest calls in the backend (thousands per frame), and the
|
|
// vector-returning overload heap-allocates on every single one.
|
|
vk::DescriptorSetAllocateInfo allocInfo;
|
|
allocInfo.descriptorSetCount = 1;
|
|
allocInfo.pSetLayouts = &layout;
|
|
|
|
// Try allocating from the last pool in the list
|
|
if (!pools.empty()) {
|
|
allocInfo.descriptorPool = pools.back().get();
|
|
|
|
vk::DescriptorSet set;
|
|
vk::Result result = m_device.allocateDescriptorSets(&allocInfo, &set);
|
|
if (result == vk::Result::eSuccess) {
|
|
return set;
|
|
}
|
|
if (result == vk::Result::eErrorOutOfPoolMemory) {
|
|
nprintf(("vulkan", "VulkanDescriptorManager: frame pool exhausted, allocating an additional pool chunk\n"));
|
|
} else if (result == vk::Result::eErrorFragmentedPool) {
|
|
nprintf(("vulkan", "VulkanDescriptorManager: frame pool fragmented, allocating an additional pool chunk\n"));
|
|
} else {
|
|
nprintf(("vulkan",
|
|
"VulkanDescriptorManager: descriptor set allocation failed (%s)\n",
|
|
vk::to_string(result).c_str()));
|
|
return {};
|
|
}
|
|
}
|
|
|
|
// Create a new pool and retry
|
|
pools.push_back(createFramePool());
|
|
nprintf(("vulkandescriptor", "VulkanDescriptorManager: Grew frame %u pool count to %zu\n",
|
|
m_currentFrame, pools.size()));
|
|
|
|
allocInfo.descriptorPool = pools.back().get();
|
|
|
|
vk::DescriptorSet set;
|
|
vk::Result result = m_device.allocateDescriptorSets(&allocInfo, &set);
|
|
if (result != vk::Result::eSuccess) {
|
|
nprintf(("vulkan",
|
|
"VulkanDescriptorManager: Failed to allocate frame descriptor set after pool growth: %s\n",
|
|
vk::to_string(result).c_str()));
|
|
return {};
|
|
}
|
|
return set;
|
|
}
|
|
|
|
void VulkanDescriptorManager::beginFrame()
|
|
{
|
|
if (!m_initialized) {
|
|
return;
|
|
}
|
|
|
|
auto& pools = m_framePools[m_currentFrame];
|
|
|
|
// Reset per-frame diagnostic counters
|
|
m_setsAllocatedThisFrame = 0;
|
|
m_writesThisFrame = 0;
|
|
|
|
// Reset all pools for the current frame
|
|
for (auto& pool : pools) {
|
|
m_device.resetDescriptorPool(pool.get());
|
|
}
|
|
|
|
// If we grew beyond the initial pool, shrink back to 1 to reclaim memory
|
|
// (the single pool will grow again next frame if needed)
|
|
if (pools.size() > 1) {
|
|
vk::UniqueDescriptorPool first = std::move(pools[0]);
|
|
pools.clear();
|
|
pools.push_back(std::move(first));
|
|
}
|
|
}
|
|
|
|
void VulkanDescriptorManager::setCurrentFrame(uint32_t frameIndex)
|
|
{
|
|
// The renderer is the single source of the frame-in-flight index and advances
|
|
// it by exactly one (mod MAX_FRAMES_IN_FLIGHT) each flip(); assert that
|
|
// invariant so a drift between the renderer and this manager is caught loudly
|
|
// instead of silently corrupting descriptor pools / per-draw sets.
|
|
Assertion(frameIndex == (m_currentFrame + 1) % MAX_FRAMES_IN_FLIGHT,
|
|
"VulkanDescriptorManager::setCurrentFrame: non-monotonic frame index (%u -> %u)",
|
|
m_currentFrame, frameIndex);
|
|
m_currentFrame = frameIndex;
|
|
}
|
|
|
|
ArrayView<VulkanDescriptorManager::UniformBindingEntry>
|
|
VulkanDescriptorManager::getUniformBindings(DescriptorSetIndex setIndex)
|
|
{
|
|
switch (setIndex) {
|
|
case DescriptorSetIndex::Global: return {s_globalUBOs, std::size(s_globalUBOs)};
|
|
case DescriptorSetIndex::Material: return {s_materialUBOs, std::size(s_materialUBOs)};
|
|
case DescriptorSetIndex::PerDraw: return {s_perDrawUBOs, std::size(s_perDrawUBOs)};
|
|
default: return {nullptr, 0};
|
|
}
|
|
}
|
|
|
|
void VulkanDescriptorManager::createSetLayouts()
|
|
{
|
|
m_globalBindingsRuntime.assign(std::begin(s_globalBindings), std::end(s_globalBindings));
|
|
if (m_raytracingEnabled) {
|
|
m_globalBindingsRuntime.push_back(s_globalTlasBinding);
|
|
}
|
|
m_globalTemplateRuntime = DescriptorSetTemplate(m_globalBindingsRuntime.data(), m_globalBindingsRuntime.size());
|
|
|
|
m_setLayouts[static_cast<size_t>(DescriptorSetIndex::Global)] = createSetLayout(m_globalTemplateRuntime);
|
|
m_setLayouts[static_cast<size_t>(DescriptorSetIndex::Material)] = createSetLayout(s_materialTemplate);
|
|
m_setLayouts[static_cast<size_t>(DescriptorSetIndex::PerDraw)] = createSetLayout(s_perDrawTemplate);
|
|
|
|
nprintf(("vulkan", "VulkanDescriptorManager: Created %zu descriptor set layouts\n",
|
|
static_cast<size_t>(DescriptorSetIndex::Count)));
|
|
}
|
|
|
|
vk::UniqueDescriptorPool VulkanDescriptorManager::createFramePool()
|
|
{
|
|
// Pool sizing constants (with rationale) live next to the other descriptor
|
|
// constants in VulkanDescriptorManager.h. Additional pool chunks are created
|
|
// automatically when one is exhausted.
|
|
SCP_vector<vk::DescriptorPoolSize> poolSizes = {
|
|
{vk::DescriptorType::eUniformBuffer, MAX_UNIFORM_BUFFERS_PER_POOL},
|
|
{vk::DescriptorType::eUniformBufferDynamic, MAX_DYNAMIC_UNIFORM_BUFFERS_PER_POOL},
|
|
{vk::DescriptorType::eCombinedImageSampler, MAX_SAMPLERS_PER_POOL},
|
|
{vk::DescriptorType::eStorageBuffer, MAX_SETS_PER_POOL},
|
|
};
|
|
if (m_raytracingEnabled) {
|
|
poolSizes.emplace_back(vk::DescriptorType::eAccelerationStructureKHR, MAX_SETS_PER_POOL);
|
|
}
|
|
|
|
vk::DescriptorPoolCreateInfo poolInfo;
|
|
poolInfo.maxSets = MAX_SETS_PER_POOL;
|
|
poolInfo.poolSizeCount = static_cast<uint32_t>(poolSizes.size());
|
|
poolInfo.pPoolSizes = poolSizes.data();
|
|
|
|
return m_device.createDescriptorPoolUnique(poolInfo);
|
|
}
|
|
|
|
void VulkanDescriptorManager::createDescriptorPools()
|
|
{
|
|
// Create one initial pool per frame (more will be added on demand)
|
|
for (uint32_t i = 0; i < MAX_FRAMES_IN_FLIGHT; ++i) {
|
|
m_framePools[i].push_back(createFramePool());
|
|
}
|
|
|
|
nprintf(("vulkan", "VulkanDescriptorManager: Created %u frame pool chains\n",
|
|
MAX_FRAMES_IN_FLIGHT));
|
|
}
|
|
|
|
vk::UniqueDescriptorSetLayout VulkanDescriptorManager::createSetLayout(
|
|
const DescriptorSetTemplate& tmpl)
|
|
{
|
|
SCP_vector<vk::DescriptorSetLayoutBinding> vkBindings;
|
|
vkBindings.reserve(tmpl.size);
|
|
|
|
for (const auto& b : tmpl) {
|
|
vk::DescriptorSetLayoutBinding binding;
|
|
binding.binding = b.binding;
|
|
binding.descriptorType = b.type;
|
|
binding.descriptorCount = b.count;
|
|
binding.stageFlags = b.stages;
|
|
binding.pImmutableSamplers = nullptr;
|
|
vkBindings.push_back(binding);
|
|
}
|
|
|
|
vk::DescriptorSetLayoutCreateInfo layoutInfo;
|
|
layoutInfo.bindingCount = static_cast<uint32_t>(vkBindings.size());
|
|
layoutInfo.pBindings = vkBindings.data();
|
|
|
|
return m_device.createDescriptorSetLayoutUnique(layoutInfo);
|
|
}
|
|
|
|
} // namespace graphics::vulkan
|