From 4f55c40a47c244e3f3485f84e441cb5c7edc5dad Mon Sep 17 00:00:00 2001 From: Mark Lobodzinski Date: Thu, 2 Feb 2017 08:31:18 -0700 Subject: layers: Plumb through image_state structures Saved some lookups by sending down state instead of images in the image validation helper functions. Change-Id: I2b21218596b8e980d4f55451a5feccdb2dac6360 --- layers/core_validation.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'layers/core_validation.cpp') diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index 4ab00388..8f2119b9 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -6528,7 +6528,8 @@ static bool PreCallValidateCreateImageView(layer_data *dev_data, const VkImageVi static inline void PostCallRecordCreateImageView(layer_data *dev_data, const VkImageViewCreateInfo *create_info, VkImageView view) { dev_data->imageViewMap[view] = unique_ptr(new IMAGE_VIEW_STATE(view, create_info)); - ResolveRemainingLevelsLayers(dev_data, &dev_data->imageViewMap[view].get()->create_info.subresourceRange, create_info->image); + ResolveRemainingLevelsLayers(dev_data, &dev_data->imageViewMap[view].get()->create_info.subresourceRange, + getImageState(dev_data, create_info->image)); } VKAPI_ATTR VkResult VKAPI_CALL CreateImageView(VkDevice device, const VkImageViewCreateInfo *pCreateInfo, @@ -8904,9 +8905,9 @@ static bool TransitionImageLayouts(VkCommandBuffer cmdBuffer, uint32_t memBarrie for (uint32_t i = 0; i < memBarrierCount; ++i) { auto mem_barrier = &pImgMemBarriers[i]; if (!mem_barrier) continue; - // TODO: Do not iterate over every possibility - consolidate where - // possible - ResolveRemainingLevelsLayers(dev_data, &levelCount, &layerCount, mem_barrier->subresourceRange, mem_barrier->image); + // TODO: Do not iterate over every possibility - consolidate where possible + ResolveRemainingLevelsLayers(dev_data, &levelCount, &layerCount, mem_barrier->subresourceRange, + getImageState(dev_data, mem_barrier->image)); for (uint32_t j = 0; j < levelCount; j++) { uint32_t level = mem_barrier->subresourceRange.baseMipLevel + j; -- cgit v1.2.3