layers: Added getSwapchainNode() helper
Added getSwapchainNode() helper to core_validation and update
DescriptorSet class to use it.
diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp
index 4c63a80..53b416f 100644
--- a/layers/core_validation.cpp
+++ b/layers/core_validation.cpp
@@ -293,6 +293,14 @@
}
return buff_it->second.get();
}
+// Return swapchain node for specified swapchain or else NULL
+SWAPCHAIN_NODE *getSwapchainNode(const layer_data *dev_data, const VkSwapchainKHR swapchain) {
+ auto swp_it = dev_data->device_extensions.swapchainMap.find(swapchain);
+ if (swp_it == dev_data->device_extensions.swapchainMap.end()) {
+ return nullptr;
+ }
+ return swp_it->second;
+}
// Return swapchain for specified image or else NULL
VkSwapchainKHR getSwapchainFromImage(const layer_data *dev_data, const VkImage image) {
auto img_it = dev_data->device_extensions.imageToSwapchainMap.find(image);
@@ -5915,7 +5923,7 @@
const cvdescriptorset::AllocateDescriptorSetsData *common_data) {
// All the updates are contained in a single cvdescriptorset function
cvdescriptorset::PerformAllocateDescriptorSets(pAllocateInfo, pDescriptorSets, common_data, &dev_data->descriptorPoolMap,
- &dev_data->setMap, dev_data, dev_data->device_extensions.swapchainMap);
+ &dev_data->setMap, dev_data);
}
VKAPI_ATTR VkResult VKAPI_CALL
@@ -7661,10 +7669,10 @@
} else if (dev_data->device_extensions.wsi_enabled) {
auto imageswap_data = getSwapchainFromImage(dev_data, mem_barrier->image);
if (imageswap_data) {
- auto swapchain_data = dev_data->device_extensions.swapchainMap.find(imageswap_data);
- if (swapchain_data != dev_data->device_extensions.swapchainMap.end()) {
- format = swapchain_data->second->createInfo.imageFormat;
- arrayLayers = swapchain_data->second->createInfo.imageArrayLayers;
+ auto swapchain_data = getSwapchainNode(dev_data, imageswap_data);
+ if (swapchain_data) {
+ format = swapchain_data->createInfo.imageFormat;
+ arrayLayers = swapchain_data->createInfo.imageArrayLayers;
mipLevels = 1;
imageFound = true;
}
@@ -9681,10 +9689,10 @@
bool skipCall = false;
std::unique_lock<std::mutex> lock(global_lock);
- auto swapchain_data = dev_data->device_extensions.swapchainMap.find(swapchain);
- if (swapchain_data != dev_data->device_extensions.swapchainMap.end()) {
- if (swapchain_data->second->images.size() > 0) {
- for (auto swapchain_image : swapchain_data->second->images) {
+ auto swapchain_data = getSwapchainNode(dev_data, swapchain);
+ if (swapchain_data) {
+ if (swapchain_data->images.size() > 0) {
+ for (auto swapchain_image : swapchain_data->images) {
auto image_sub = dev_data->imageSubresourceMap.find(swapchain_image);
if (image_sub != dev_data->imageSubresourceMap.end()) {
for (auto imgsubpair : image_sub->second) {
@@ -9700,7 +9708,7 @@
dev_data->imageMap.erase(swapchain_image);
}
}
- delete swapchain_data->second;
+ delete swapchain_data;
dev_data->device_extensions.swapchainMap.erase(swapchain);
}
lock.unlock();
@@ -9719,8 +9727,8 @@
return result;
std::lock_guard<std::mutex> lock(global_lock);
const size_t count = *pCount;
- auto swapchain_node = dev_data->device_extensions.swapchainMap[swapchain];
- if (!swapchain_node->images.empty()) {
+ auto swapchain_node = getSwapchainNode(dev_data, swapchain);
+ if (swapchain_node && !swapchain_node->images.empty()) {
// TODO : Not sure I like the memcmp here, but it works
const bool mismatch = (swapchain_node->images.size() != count ||
memcmp(&swapchain_node->images[0], pSwapchainImages, sizeof(swapchain_node->images[0]) * count));
@@ -9783,10 +9791,9 @@
}
VkDeviceMemory mem;
for (uint32_t i = 0; i < pPresentInfo->swapchainCount; ++i) {
- auto swapchain_data = dev_data->device_extensions.swapchainMap.find(pPresentInfo->pSwapchains[i]);
- if (swapchain_data != dev_data->device_extensions.swapchainMap.end() &&
- pPresentInfo->pImageIndices[i] < swapchain_data->second->images.size()) {
- VkImage image = swapchain_data->second->images[pPresentInfo->pImageIndices[i]];
+ auto swapchain_data = getSwapchainNode(dev_data, pPresentInfo->pSwapchains[i]);
+ if (swapchain_data && pPresentInfo->pImageIndices[i] < swapchain_data->images.size()) {
+ VkImage image = swapchain_data->images[pPresentInfo->pImageIndices[i]];
#if MTMERGESOURCE
skip_call |=
get_mem_binding_from_object(dev_data, (uint64_t)(image), VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT, &mem);
diff --git a/layers/core_validation_types.h b/layers/core_validation_types.h
index 1d601f4..9ec8135 100644
--- a/layers/core_validation_types.h
+++ b/layers/core_validation_types.h
@@ -493,6 +493,7 @@
SAMPLER_NODE *getSamplerNode(const layer_data *, const VkSampler);
VkImageViewCreateInfo *getImageViewData(const layer_data *, const VkImageView);
VkSwapchainKHR getSwapchainFromImage(const layer_data *, const VkImage);
+SWAPCHAIN_NODE *getSwapchainNode(const layer_data *, const VkSwapchainKHR);
}
#endif // CORE_VALIDATION_TYPES_H_
diff --git a/layers/descriptor_sets.cpp b/layers/descriptor_sets.cpp
index 2393d30..8ccd334 100644
--- a/layers/descriptor_sets.cpp
+++ b/layers/descriptor_sets.cpp
@@ -264,9 +264,8 @@
: required_descriptors_by_type{}, layout_nodes(count, nullptr) {}
cvdescriptorset::DescriptorSet::DescriptorSet(const VkDescriptorSet set, const DescriptorSetLayout *layout,
- const core_validation::layer_data *dev_data,
- const std::unordered_map<VkSwapchainKHR, SWAPCHAIN_NODE *> *swapchain_map)
- : some_update_(false), set_(set), p_layout_(layout), device_data_(dev_data), swapchain_map_(swapchain_map) {
+ const core_validation::layer_data *dev_data)
+ : some_update_(false), set_(set), p_layout_(layout), device_data_(dev_data) {
// Foreach binding, create default descriptors of given type
for (uint32_t i = 0; i < p_layout_->GetBindingCount(); ++i) {
auto type = p_layout_->GetTypeFromIndex(i);
@@ -581,7 +580,6 @@
bool cvdescriptorset::ValidateImageUpdate(VkImageView image_view, VkImageLayout image_layout, VkDescriptorType type,
const core_validation::layer_data *dev_data,
- const std::unordered_map<VkSwapchainKHR, SWAPCHAIN_NODE *> *swapchain_map,
std::string *error) {
auto iv_data = getImageViewData(dev_data, image_view);
if (!iv_data) {
@@ -604,9 +602,9 @@
// Also need to check the swapchains.
auto swapchain = getSwapchainFromImage(dev_data, image);
if (swapchain) {
- auto swapchain_pair = swapchain_map->find(swapchain);
- if (swapchain_pair != swapchain_map->end()) {
- format = swapchain_pair->second->createInfo.imageFormat;
+ auto swapchain_node = getSwapchainNode(dev_data, swapchain);
+ if (swapchain_node) {
+ format = swapchain_node->createInfo.imageFormat;
}
}
}
@@ -1028,7 +1026,7 @@
// Validate image
auto image_view = update->pImageInfo[di].imageView;
auto image_layout = update->pImageInfo[di].imageLayout;
- if (!ValidateImageUpdate(image_view, image_layout, update->descriptorType, device_data_, swapchain_map_, error)) {
+ if (!ValidateImageUpdate(image_view, image_layout, update->descriptorType, device_data_, error)) {
std::stringstream error_str;
error_str << "Attempted write update to combined image sampler descriptor failed due to: " << error->c_str();
*error = error_str.str();
@@ -1059,7 +1057,7 @@
for (uint32_t di = 0; di < update->descriptorCount; ++di) {
auto image_view = update->pImageInfo[di].imageView;
auto image_layout = update->pImageInfo[di].imageLayout;
- if (!ValidateImageUpdate(image_view, image_layout, update->descriptorType, device_data_, swapchain_map_, error)) {
+ if (!ValidateImageUpdate(image_view, image_layout, update->descriptorType, device_data_, error)) {
std::stringstream error_str;
error_str << "Attempted write update to image descriptor failed due to: " << error->c_str();
*error = error_str.str();
@@ -1149,7 +1147,7 @@
// Validate image
auto image_view = img_samp_desc->GetImageView();
auto image_layout = img_samp_desc->GetImageLayout();
- if (!ValidateImageUpdate(image_view, image_layout, type, device_data_, swapchain_map_, error)) {
+ if (!ValidateImageUpdate(image_view, image_layout, type, device_data_, error)) {
std::stringstream error_str;
error_str << "Attempted copy update to combined image sampler descriptor failed due to: " << error->c_str();
*error = error_str.str();
@@ -1162,7 +1160,7 @@
auto img_desc = static_cast<const ImageDescriptor *>(src_set->descriptors_[index + di].get());
auto image_view = img_desc->GetImageView();
auto image_layout = img_desc->GetImageLayout();
- if (!ValidateImageUpdate(image_view, image_layout, type, device_data_, swapchain_map_, error)) {
+ if (!ValidateImageUpdate(image_view, image_layout, type, device_data_, error)) {
std::stringstream error_str;
error_str << "Attempted copy update to image descriptor failed due to: " << error->c_str();
*error = error_str.str();
@@ -1268,11 +1266,12 @@
return skip_call;
}
// Decrement allocated sets from the pool and insert new sets into set_map
-void cvdescriptorset::PerformAllocateDescriptorSets(
- const VkDescriptorSetAllocateInfo *p_alloc_info, const VkDescriptorSet *descriptor_sets,
- const AllocateDescriptorSetsData *ds_data, std::unordered_map<VkDescriptorPool, DESCRIPTOR_POOL_NODE *> *pool_map,
- std::unordered_map<VkDescriptorSet, cvdescriptorset::DescriptorSet *> *set_map, const core_validation::layer_data *dev_data,
- const std::unordered_map<VkSwapchainKHR, SWAPCHAIN_NODE *> &swapchain_map) {
+void cvdescriptorset::PerformAllocateDescriptorSets(const VkDescriptorSetAllocateInfo *p_alloc_info,
+ const VkDescriptorSet *descriptor_sets,
+ const AllocateDescriptorSetsData *ds_data,
+ std::unordered_map<VkDescriptorPool, DESCRIPTOR_POOL_NODE *> *pool_map,
+ std::unordered_map<VkDescriptorSet, cvdescriptorset::DescriptorSet *> *set_map,
+ const core_validation::layer_data *dev_data) {
auto pool_state = (*pool_map)[p_alloc_info->descriptorPool];
/* Account for sets and individual descriptors allocated from pool */
pool_state->availableSets -= p_alloc_info->descriptorSetCount;
@@ -1283,7 +1282,7 @@
* global map and the pool's set.
*/
for (uint32_t i = 0; i < p_alloc_info->descriptorSetCount; i++) {
- auto new_ds = new cvdescriptorset::DescriptorSet(descriptor_sets[i], ds_data->layout_nodes[i], dev_data, &swapchain_map);
+ auto new_ds = new cvdescriptorset::DescriptorSet(descriptor_sets[i], ds_data->layout_nodes[i], dev_data);
pool_state->sets.insert(new_ds);
new_ds->in_use.store(0);
diff --git a/layers/descriptor_sets.h b/layers/descriptor_sets.h
index 88bcef2..1b7ebb4 100644
--- a/layers/descriptor_sets.h
+++ b/layers/descriptor_sets.h
@@ -161,8 +161,7 @@
// Shared helper functions - These are useful because the shared sampler image descriptor type
// performs common functions with both sampler and image descriptors so they can share their common functions
bool ValidateSampler(const VkSampler, const core_validation::layer_data *);
-bool ValidateImageUpdate(VkImageView, VkImageLayout, VkDescriptorType, const core_validation::layer_data *,
- const std::unordered_map<VkSwapchainKHR, SWAPCHAIN_NODE *> *, std::string *);
+bool ValidateImageUpdate(VkImageView, VkImageLayout, VkDescriptorType, const core_validation::layer_data *, std::string *);
class SamplerDescriptor : public Descriptor {
public:
@@ -265,8 +264,7 @@
void PerformAllocateDescriptorSets(const VkDescriptorSetAllocateInfo *, const VkDescriptorSet *, const AllocateDescriptorSetsData *,
std::unordered_map<VkDescriptorPool, DESCRIPTOR_POOL_NODE *> *,
std::unordered_map<VkDescriptorSet, cvdescriptorset::DescriptorSet *> *,
- const core_validation::layer_data *,
- const std::unordered_map<VkSwapchainKHR, SWAPCHAIN_NODE *> &);
+ const core_validation::layer_data *);
/*
* DescriptorSet class
@@ -289,8 +287,7 @@
class DescriptorSet : public BASE_NODE {
public:
using BASE_NODE::in_use;
- DescriptorSet(const VkDescriptorSet, const DescriptorSetLayout *, const core_validation::layer_data *,
- const std::unordered_map<VkSwapchainKHR, SWAPCHAIN_NODE *> *);
+ DescriptorSet(const VkDescriptorSet, const DescriptorSetLayout *, const core_validation::layer_data *);
~DescriptorSet();
// A number of common Get* functions that return data based on layout from which this set was created
uint32_t GetTotalDescriptorCount() const { return p_layout_ ? p_layout_->GetTotalDescriptorCount() : 0; };
@@ -367,8 +364,6 @@
std::vector<std::unique_ptr<Descriptor>> descriptors_;
// Ptrs to object containers to verify bound data
const core_validation::layer_data *device_data_;
- // TODO : For next 3 maps all we really need (currently) is an image to format mapping
- const std::unordered_map<VkSwapchainKHR, SWAPCHAIN_NODE *> *swapchain_map_;
};
}
#endif // CORE_VALIDATION_DESCRIPTOR_SETS_H_