Nyaaori/gamescope
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

rendervulkan: Rework sampler cache.

Browse source 
Less awkward to use and also fixes a texture leak because the shared_ptr
to the texture is no longer stored in the sampler cache.
This commit is contained in:
Georg Lehmann 2021-12-28 15:13:11 +01:00 committed by Joshie
parent 95eba7e549
commit 7c5cc5e67e
2 changed files with 46 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
src/rendervulkan.cpp
View file

@ -107,14 +107,37 @@ struct VkPhysicalDeviceMemoryProperties memoryProperties;
VulkanOutput_t g_output;
struct VulkanSamplerCacheEntry_t
struct VulkanSamplerCacheKey_t
{
VulkanPipeline_t::LayerBinding_t key;
VkSampler sampler;
bool bForceNearest;
bool bNearest : 1;
bool bUnnormalized : 1;
VulkanSamplerCacheKey_t( void )
{
bNearest = false;
bUnnormalized = false;
}
bool operator==( const VulkanSamplerCacheKey_t& other ) const
{
return this->bNearest == other.bNearest
&& this->bUnnormalized == other.bUnnormalized;
}
};
std::vector< VulkanSamplerCacheEntry_t > g_vecVulkanSamplerCache;
namespace std
{
template <>
struct hash<VulkanSamplerCacheKey_t>
{
size_t operator()( const VulkanSamplerCacheKey_t& k ) const
{
return k.bNearest | (k.bUnnormalized << 1);
}
};
}
std::unordered_map< VulkanSamplerCacheKey_t, VkSampler > g_vulkanSamplerCache;
std::shared_ptr<CVulkanTexture> g_emptyTex;
@ -1910,32 +1933,29 @@ std::shared_ptr<CVulkanTexture> vulkan_create_texture_from_bits( uint32_t width,
return pTex;
}
bool operator==(const struct VulkanPipeline_t::LayerBinding_t& lhs, struct VulkanPipeline_t::LayerBinding_t& rhs)
VkSampler vulkan_make_sampler( VulkanSamplerCacheKey_t key )
{
if ( lhs.bFilter != rhs.bFilter )
return false;
if ( g_vulkanSamplerCache.count(key) != 0 )
return g_vulkanSamplerCache[key];
return true;
}
VkSampler vulkan_make_sampler( struct VulkanPipeline_t::LayerBinding_t *pBinding, bool bForceNearest )
{
VkSampler ret = VK_NULL_HANDLE;
VkSamplerCreateInfo samplerCreateInfo = {
.sType = VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO,
.pNext = nullptr,
.magFilter = (pBinding->bFilter && !bForceNearest) ? VK_FILTER_LINEAR : VK_FILTER_NEAREST,
.minFilter = (pBinding->bFilter && !bForceNearest) ? VK_FILTER_LINEAR : VK_FILTER_NEAREST,
.magFilter = key.bNearest ? VK_FILTER_NEAREST : VK_FILTER_LINEAR,
.minFilter = key.bNearest ? VK_FILTER_NEAREST : VK_FILTER_LINEAR,
.addressModeU = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE,
.addressModeV = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE,
.addressModeW = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE,
.borderColor = VK_BORDER_COLOR_INT_TRANSPARENT_BLACK,
.unnormalizedCoordinates = VK_TRUE,
.borderColor = VK_BORDER_COLOR_FLOAT_TRANSPARENT_BLACK,
.unnormalizedCoordinates = key.bUnnormalized,
};
vkCreateSampler( device, &samplerCreateInfo, nullptr, &ret );
g_vulkanSamplerCache[key] = ret;
return ret;
}
@ -1984,7 +2004,6 @@ void vulkan_update_descriptor( struct Composite_t *pComposite, struct VulkanPipe
std::array< VkDescriptorImageInfo, k_nMaxLayers > imageDescriptors = {};
for ( uint32_t i = 0; i < k_nMaxLayers; i++ )
{
VkSampler sampler = VK_NULL_HANDLE;
bool bForceNearest = pComposite->data.vScale[i].x == 1.0f &&
pComposite->data.vScale[i].y == 1.0f &&
float_is_integer(pComposite->data.vOffset[i].x);
@ -1994,27 +2013,13 @@ void vulkan_update_descriptor( struct Composite_t *pComposite, struct VulkanPipe
? pPipeline->layerBindings[ i ].tex
: g_emptyTex;
// First try to look up the sampler in the cache.
for ( uint32_t j = 0; j < g_vecVulkanSamplerCache.size(); j++ )
{
if ( g_vecVulkanSamplerCache[ j ].key == pPipeline->layerBindings[ i ] &&
g_vecVulkanSamplerCache[ j ].bForceNearest == bForceNearest )
{
sampler = g_vecVulkanSamplerCache[ j ].sampler;
break;
}
}
if ( sampler == VK_NULL_HANDLE )
{
sampler = vulkan_make_sampler( &pPipeline->layerBindings[ i ], bForceNearest );
VulkanSamplerCacheKey_t samplerKey;
samplerKey.bNearest = bForceNearest || !pPipeline->layerBindings[i].bFilter;
samplerKey.bUnnormalized = true;
VkSampler sampler = vulkan_make_sampler(samplerKey);
assert ( sampler != VK_NULL_HANDLE );
VulkanSamplerCacheEntry_t entry = { pPipeline->layerBindings[ i ], sampler, bForceNearest };
g_vecVulkanSamplerCache.push_back( entry );
}
{
VkDescriptorImageInfo imageInfo = {
.sampler = sampler,

1
src/rendervulkan.hpp
View file

@ -24,7 +24,6 @@ struct VulkanPipeline_t
int zpos;
// These fields below count for the sampler cache
bool bFilter;
} layerBindings[ k_nMaxLayers ];
};