phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-03-26 16:50:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix: add VkSampler cache to prevent sampler exhaustion crash

Browse source 
Validation layers revealed 9965 VkSamplers allocated against a device
limit of 4000 — every VkTexture created its own sampler even when
configurations were identical. This exhausted NVIDIA's sampler pool
and caused intermittent SIGSEGV in vkCmdBeginRenderPass.

Add a thread-safe sampler cache in VkContext that deduplicates samplers
by FNV-1a hash of all 14 VkSamplerCreateInfo fields. All texture,
render target, renderer, water, and loading screen sampler creation
now goes through getOrCreateSampler(). Textures set ownsSampler_=false
so shared samplers aren't double-freed.

Also auto-disable anisotropy in the cache when the physical device
doesn't support the samplerAnisotropy feature, fixing the validation
error VUID-VkSamplerCreateInfo-anisotropyEnable-01070.
This commit is contained in:
Kelsi 2026-03-24 11:44:54 -07:00
parent 1556559211
commit a152023e5e
10 changed files with 194 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/rendering/vk_texture.cpp
View file

@ -13,9 +13,11 @@ VkTexture::~VkTexture() {
}
VkTexture::VkTexture(VkTexture&& other) noexcept
: image_(other.image_), sampler_(other.sampler_), mipLevels_(other.mipLevels_) {
: image_(other.image_), sampler_(other.sampler_), mipLevels_(other.mipLevels_),
ownsSampler_(other.ownsSampler_) {
other.image_ = {};
other.sampler_ = VK_NULL_HANDLE;
other.ownsSampler_ = true;
}
VkTexture& VkTexture::operator=(VkTexture&& other) noexcept {
@ -23,8 +25,10 @@ VkTexture& VkTexture::operator=(VkTexture&& other) noexcept {
image_ = other.image_;
sampler_ = other.sampler_;
mipLevels_ = other.mipLevels_;
ownsSampler_ = other.ownsSampler_;
other.image_ = {};
other.sampler_ = VK_NULL_HANDLE;
other.ownsSampler_ = true;
}
return *this;
}
@ -214,11 +218,20 @@ bool VkTexture::createSampler(VkDevice device,
samplerInfo.minLod = 0.0f;
samplerInfo.maxLod = static_cast<float>(mipLevels_);
// Use sampler cache if VkContext is available.
auto* ctx = VkContext::globalInstance();
if (ctx) {
sampler_ = ctx->getOrCreateSampler(samplerInfo);
ownsSampler_ = false;
return sampler_ != VK_NULL_HANDLE;
}
// Fallback: no VkContext (shouldn't happen in normal use).
if (vkCreateSampler(device, &samplerInfo, nullptr, &sampler_) != VK_SUCCESS) {
LOG_ERROR("Failed to create texture sampler");
return false;
}
ownsSampler_ = true;
return true;
}
@ -246,11 +259,20 @@ bool VkTexture::createSampler(VkDevice device,
samplerInfo.minLod = 0.0f;
samplerInfo.maxLod = static_cast<float>(mipLevels_);
// Use sampler cache if VkContext is available.
auto* ctx = VkContext::globalInstance();
if (ctx) {
sampler_ = ctx->getOrCreateSampler(samplerInfo);
ownsSampler_ = false;
return sampler_ != VK_NULL_HANDLE;
}
// Fallback: no VkContext (shouldn't happen in normal use).
if (vkCreateSampler(device, &samplerInfo, nullptr, &sampler_) != VK_SUCCESS) {
LOG_ERROR("Failed to create texture sampler");
return false;
}
ownsSampler_ = true;
return true;
}
@ -269,19 +291,29 @@ bool VkTexture::createShadowSampler(VkDevice device) {
samplerInfo.minLod = 0.0f;
samplerInfo.maxLod = 1.0f;
// Use sampler cache if VkContext is available.
auto* ctx = VkContext::globalInstance();
if (ctx) {
sampler_ = ctx->getOrCreateSampler(samplerInfo);
ownsSampler_ = false;
return sampler_ != VK_NULL_HANDLE;
}
// Fallback: no VkContext (shouldn't happen in normal use).
if (vkCreateSampler(device, &samplerInfo, nullptr, &sampler_) != VK_SUCCESS) {
LOG_ERROR("Failed to create shadow sampler");
return false;
}
ownsSampler_ = true;
return true;
}
void VkTexture::destroy(VkDevice device, VmaAllocator allocator) {
if (sampler_ != VK_NULL_HANDLE) {
if (sampler_ != VK_NULL_HANDLE && ownsSampler_) {
vkDestroySampler(device, sampler_, nullptr);
sampler_ = VK_NULL_HANDLE;
}
sampler_ = VK_NULL_HANDLE;
ownsSampler_ = true;
destroyImage(device, allocator, image_);
}