Update image layout transition assertions, but don't uncomment them yet

This commit is contained in:
baldurk
2016-01-09 23:41:24 +01:00
parent 8179d29f64
commit 0779ef2105
+4 -4
View File
@@ -78,7 +78,7 @@ void VulkanResourceManager::RecordSingleBarrier(vector< pair<ResourceId, ImageRe
it->second.subresourceRange.layerCount == numslices)
{
// verify
//RDCASSERT(it->second.state == t.oldLayout);
//RDCASSERT(it->second.newLayout == t.oldLayout);
// apply it (prevstate is from the start of all barriers accumulated, so only set once)
if(it->second.oldLayout == UNKNOWN_PREV_IMG_LAYOUT)
@@ -367,9 +367,9 @@ void VulkanResourceManager::ApplyBarriers(vector< pair<ResourceId, ImageRegionSt
it->subresourceRange.layerCount == numslices)
{
/*
RDCASSERT(t.prevstate == UNKNOWN_PREV_IMG_LAYOUT || it->state == UNKNOWN_PREV_IMG_LAYOUT || // renderdoc untracked/ignored
it->state == t.prevstate || // valid barrier
t.prevstate == VK_IMAGE_LAYOUT_UNDEFINED); // can barrier from UNDEFINED to any state
RDCASSERT(t.oldLayout == UNKNOWN_PREV_IMG_LAYOUT || it->newLayout == UNKNOWN_PREV_IMG_LAYOUT || // renderdoc untracked/ignored
it->newLayout == t.oldLayout || // valid barrier
t.oldLayout == VK_IMAGE_LAYOUT_UNDEFINED); // can barrier from UNDEFINED to any state
*/
t.oldLayout = it->newLayout;
it->newLayout = t.newLayout;