diff options
| author | Chris Forbes <chrisforbes@google.com> | 2016-11-16 14:30:05 +1300 |
|---|---|---|
| committer | Chris Forbes <chrisforbes@google.com> | 2016-11-21 11:07:36 +1300 |
| commit | 07d903984055ef1ccc7797a9dcdb66c98c3b3f81 (patch) | |
| tree | b833a2131669a57c7ce9ff0498ce064f4b7585eb /layers/core_validation.cpp | |
| parent | e2cbc0a8690a29590488b76a3f68e6ed5bd5e904 (diff) | |
| download | usermoji-07d903984055ef1ccc7797a9dcdb66c98c3b3f81.tar.xz | |
layers: Only call ValidateLayouts if no prior error
The long-term solution here is to merge some of this code together, but
validating the layouts later and only if nothing else was bogus is a
good start.
Signed-off-by: Chris Forbes <chrisforbes@google.com>
Diffstat (limited to 'layers/core_validation.cpp')
| -rw-r--r-- | layers/core_validation.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index a1b146b0..7177ee09 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -10425,10 +10425,12 @@ VKAPI_ATTR VkResult VKAPI_CALL CreateRenderPass(VkDevice device, const VkRenderP std::unique_lock<std::mutex> lock(global_lock); - skip_call |= ValidateLayouts(dev_data, device, pCreateInfo); // TODO: As part of wrapping up the mem_tracker/core_validation merge the following routine should be consolidated with // ValidateLayouts. skip_call |= ValidateRenderpassAttachmentUsage(dev_data, pCreateInfo); + if (!skip_call) { + skip_call |= ValidateLayouts(dev_data, device, pCreateInfo); + } lock.unlock(); if (skip_call) { |