aboutsummaryrefslogtreecommitdiff
path: root/layers/core_validation.cpp
diff options
context:
space:
mode:
authorMark Lobodzinski <mark@lunarg.com>2017-02-02 08:31:18 -0700
committerMark Lobodzinski <mark@lunarg.com>2017-02-02 10:02:21 -0700
commit4f55c40a47c244e3f3485f84e441cb5c7edc5dad (patch)
tree43580ffad28f868b74fa877c93615a3a8dfe12e5 /layers/core_validation.cpp
parentd2fc3184ae47dd3aebaeb59a853740a7a66aa6e8 (diff)
downloadusermoji-4f55c40a47c244e3f3485f84e441cb5c7edc5dad.tar.xz
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
Diffstat (limited to 'layers/core_validation.cpp')
-rw-r--r--layers/core_validation.cpp9
1 files changed, 5 insertions, 4 deletions
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<IMAGE_VIEW_STATE>(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;