diff options
author | Chris Forbes <chrisforbes@google.com> | 2017-04-26 10:21:20 -0700 |
---|---|---|
committer | Chris Forbes <chrisf@ijw.co.nz> | 2017-04-27 05:49:42 +1200 |
commit | 0d2fd381af11d2202d3856cb2da2c7122a0294ef (patch) | |
tree | 790c83135b69f442b2495664db6b9a121353378a | |
parent | a7c7398a9a5383c6cac5195b896d13463eb5cfe2 (diff) |
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
-rw-r--r-- | layers/buffer_validation.cpp | 8 | ||||
-rw-r--r-- | layers/core_validation.cpp | 1 | ||||
-rw-r--r-- | layers/core_validation_types.h | 1 |
3 files changed, 1 insertions, 9 deletions
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, diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index 6ae34428..da54b48b 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -3412,7 +3412,6 @@ static void resetCB(layer_data *dev_data, const VkCommandBuffer cb) { pCB->queryToStateMap.clear(); pCB->activeQueries.clear(); pCB->startedQueries.clear(); - pCB->imageSubresourceMap.clear(); pCB->imageLayoutMap.clear(); pCB->eventToStageMap.clear(); pCB->drawData.clear(); diff --git a/layers/core_validation_types.h b/layers/core_validation_types.h index 68017d1c..48d92b44 100644 --- a/layers/core_validation_types.h +++ b/layers/core_validation_types.h @@ -654,7 +654,6 @@ struct GLOBAL_CB_NODE : public BASE_NODE { std::unordered_set<QueryObject> activeQueries; std::unordered_set<QueryObject> startedQueries; std::unordered_map<ImageSubresourcePair, IMAGE_CMD_BUF_LAYOUT_NODE> imageLayoutMap; - std::unordered_map<VkImage, std::vector<ImageSubresourcePair>> imageSubresourceMap; std::unordered_map<VkEvent, VkPipelineStageFlags> eventToStageMap; std::vector<DRAW_DATA> drawData; DRAW_DATA currentDrawData; |