From 4013a159700a25f77b04b82bdd40331b42ccd285 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Wed, 26 Apr 2017 10:21:20 -0700 Subject: layers: Remove GLOBAL_CB_NODE::imageSubresourceMap This served no purpose. We can get the same result in the one place that matters, by consulting GLOBAL_CB_NODE::imageLayoutMap --- layers/buffer_validation.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'layers/buffer_validation.cpp') diff --git a/layers/buffer_validation.cpp b/layers/buffer_validation.cpp index eefd2ab0..0cd9f36f 100644 --- a/layers/buffer_validation.cpp +++ b/layers/buffer_validation.cpp @@ -32,8 +32,7 @@ #include "buffer_validation.h" void SetLayout(layer_data *device_data, GLOBAL_CB_NODE *pCB, ImageSubresourcePair imgpair, const VkImageLayout &layout) { - if (std::find(pCB->imageSubresourceMap[imgpair.image].begin(), pCB->imageSubresourceMap[imgpair.image].end(), imgpair) != - pCB->imageSubresourceMap[imgpair.image].end()) { + if (pCB->imageLayoutMap.find(imgpair) != pCB->imageLayoutMap.end()) { pCB->imageLayoutMap[imgpair].layout = layout; } else { assert(imgpair.hasSubresource); @@ -222,11 +221,6 @@ void SetGlobalLayout(layer_data *device_data, ImageSubresourcePair imgpair, cons // Set the layout on the cmdbuf level void SetLayout(layer_data *device_data, GLOBAL_CB_NODE *pCB, ImageSubresourcePair imgpair, const IMAGE_CMD_BUF_LAYOUT_NODE &node) { pCB->imageLayoutMap[imgpair] = node; - auto subresource = - std::find(pCB->imageSubresourceMap[imgpair.image].begin(), pCB->imageSubresourceMap[imgpair.image].end(), imgpair); - if (subresource == pCB->imageSubresourceMap[imgpair.image].end()) { - pCB->imageSubresourceMap[imgpair.image].push_back(imgpair); - } } // Set image layout for given VkImageSubresourceRange struct void SetImageLayout(layer_data *device_data, GLOBAL_CB_NODE *cb_node, const IMAGE_STATE *image_state, -- cgit v1.2.3