From ae8d3b1c5982f64b581ab3489680ee247af4f1b3 Mon Sep 17 00:00:00 2001 From: Mark Lobodzinski Date: Wed, 11 Jan 2017 11:36:16 -0700 Subject: layers: Move CreateImage recording to buf/img module - Move source from core_validation.cpp into new module - Add new module to layers cmake file - Update android build scripts/makefiles for new files Change-Id: Ia4000b26384d96a551d727f5e37997372f01764a --- layers/core_validation.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'layers/core_validation.cpp') diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index ade1ce7d..03429a1f 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -61,6 +61,7 @@ #pragma GCC diagnostic warning "-Wwrite-strings" #endif #include "core_validation.h" +#include "buffer_validation.h" #include "vk_layer_table.h" #include "vk_layer_data.h" #include "vk_layer_extension_utils.h" @@ -6482,13 +6483,7 @@ VKAPI_ATTR VkResult VKAPI_CALL CreateImage(VkDevice device, const VkImageCreateI if (VK_SUCCESS == result) { std::lock_guard lock(global_lock); - IMAGE_LAYOUT_NODE image_state; - image_state.layout = pCreateInfo->initialLayout; - image_state.format = pCreateInfo->format; - dev_data->imageMap.insert(std::make_pair(*pImage, unique_ptr(new IMAGE_STATE(*pImage, pCreateInfo)))); - ImageSubresourcePair subpair = {*pImage, false, VkImageSubresource()}; - dev_data->imageSubresourceMap[*pImage].push_back(subpair); - dev_data->imageLayoutMap[subpair] = image_state; + PostCallRecordCreateImage(dev_data->imageMap, dev_data->imageSubresourceMap, dev_data->imageLayoutMap, pCreateInfo, pImage); } return result; } -- cgit v1.2.3