aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Stroyan <stroyan@google.com>2016-02-18 14:44:17 -0700
committerTobin Ehlis <tobine@google.com>2016-02-24 08:57:30 -0700
commit7a9764bdabc4768b1a95245bd30755f39b924f53 (patch)
tree2f6e8f7525f0834a584db9b3fcb942165569b53e
parent27e4fe97725b6f87d45d4bfb00e416432e0e8453 (diff)
downloadusermoji-7a9764bdabc4768b1a95245bd30755f39b924f53.tar.xz
layers: Allow draw_state layout mismatch with UNDEFINED
Also allow CB initialLayout of VK_IMAGE_LAYOUT_UNDEFINED to match any layout.
-rw-r--r--layers/draw_state.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp
index a90b3bd0..b67e9964 100644
--- a/layers/draw_state.cpp
+++ b/layers/draw_state.cpp
@@ -3717,7 +3717,10 @@ VkBool32 ValidateCmdBufImageLayouts(VkCommandBuffer cmdBuffer) {
"Cannot submit cmd buffer using deleted image %" PRIu64 ".",
reinterpret_cast<const uint64_t &>(cb_image_data.first));
} else {
- if (imageLayout != cb_image_data.second.initialLayout) {
+ if (cb_image_data.second.initialLayout == VK_IMAGE_LAYOUT_UNDEFINED) {
+ // TODO: Set memory invalid which is in mem_tracker currently
+ }
+ else if (imageLayout != cb_image_data.second.initialLayout) {
skip_call |= log_msg(
dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT,
VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_BUFFER_EXT, 0, __LINE__,