AxioDL/boo
2
0
Fork 0
mirror of https://github.com/AxioDL/boo.git synced 2025-12-18 17:35:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

support for nullptr in texture binding array

Browse Source
This commit is contained in:
Jack Andersen
2016-07-30 16:05:20 -10:00
parent c01b0b4c6a
commit bec368dfe7
2 changed files with 20 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/graphicsdev/Vulkan.cpp
View File

@@ -1982,13 +1982,7 @@ struct VulkanShaderDataBinding : IShaderDataBinding
m_ubufs[i] = ubufs[i];
}
for (size_t i=0 ; i<texCount ; ++i)
{
#ifndef NDEBUG
if (!texs[i])
Log.report(logvisor::Fatal, "null texture %d provided to newShaderDataBinding", int(i));
#endif
m_texs[i] = texs[i];
}
size_t totalDescs = ubufCount + texCount;
if (totalDescs > 0)
@@ -2099,7 +2093,7 @@ struct VulkanShaderDataBinding : IShaderDataBinding
for (size_t i=0 ; i<BOO_GLSL_MAX_TEXTURE_COUNT ; ++i)
{
if (i<m_texCount)
if (i<m_texCount && m_texs[i])
{
writes[totalWrites].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
writes[totalWrites].pNext = nullptr;
@@ -2137,7 +2131,7 @@ struct VulkanShaderDataBinding : IShaderDataBinding
size_t totalWrites = 0;
for (size_t i=0 ; i<BOO_GLSL_MAX_TEXTURE_COUNT ; ++i)
{
if (i<m_texCount)
if (i<m_texCount && m_texs[i])
{
const VkDescriptorImageInfo* resComp = GetTextureGPUResource(m_texs[i], b);
if (resComp->imageView != m_knownViewHandles[b][i])