Ensure VulkanTextureR layouts are predictably initialized

This commit is contained in:
Jack Andersen 2018-10-18 13:55:15 -10:00
parent 7d1be415c6
commit 9d91cd459e
1 changed files with 22 additions and 0 deletions

View File

@ -2049,6 +2049,23 @@ public:
m_height = height; m_height = height;
Setup(ctx); Setup(ctx);
} }
void initializeBindLayouts(VulkanContext* ctx)
{
for (size_t i=0 ; i<m_colorBindCount ; ++i)
{
SetImageLayout(ctx->m_loadCmdBuf, m_colorBindTex[i].m_image, VK_IMAGE_ASPECT_COLOR_BIT,
VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL, 1, 1);
m_colorBindLayout[i] = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
}
for (size_t i=0 ; i<m_depthBindCount ; ++i)
{
SetImageLayout(ctx->m_loadCmdBuf, m_depthBindTex[i].m_image, VK_IMAGE_ASPECT_DEPTH_BIT,
VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL, 1, 1);
m_depthBindLayout[i] = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
}
}
}; };
static const size_t SEMANTIC_SIZE_TABLE[] = static const size_t SEMANTIC_SIZE_TABLE[] =
@ -3769,6 +3786,11 @@ void VulkanDataFactoryImpl::commitTransaction
static_cast<VulkanTextureD&>(tex).placeForGPU(m_ctx, poolBuf.m_buffer, mappedData); static_cast<VulkanTextureD&>(tex).placeForGPU(m_ctx, poolBuf.m_buffer, mappedData);
} }
/* initialize bind texture layout */
if (data->m_RTexs)
for (ITextureR& tex : *data->m_RTexs)
static_cast<VulkanTextureR&>(tex).initializeBindLayouts(m_ctx);
/* Execute static uploads */ /* Execute static uploads */
ThrowIfFailed(vk::EndCommandBuffer(m_ctx->m_loadCmdBuf)); ThrowIfFailed(vk::EndCommandBuffer(m_ctx->m_loadCmdBuf));
VkSubmitInfo submitInfo = {}; VkSubmitInfo submitInfo = {};