From 10e7d9c4d77b108f3a2ac563b3388c7af7a1e341 Mon Sep 17 00:00:00 2001 From: Tobin Ehlis Date: Wed, 12 Oct 2016 15:01:39 -0600 Subject: layers:Update some pool_node naming Change some pool_node names to pool_state in DescriptorSet class. Also update getPool function prototype to the new name of getDescriptorSetState(). --- layers/descriptor_sets.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'layers/descriptor_sets.cpp') diff --git a/layers/descriptor_sets.cpp b/layers/descriptor_sets.cpp index dc647e24..5f927497 100644 --- a/layers/descriptor_sets.cpp +++ b/layers/descriptor_sets.cpp @@ -1498,24 +1498,24 @@ bool cvdescriptorset::ValidateAllocateDescriptorSets(const debug_report_data *re } } } - auto pool_node = getPoolNode(dev_data, p_alloc_info->descriptorPool); + auto pool_state = getDescriptorPoolState(dev_data, p_alloc_info->descriptorPool); // Track number of descriptorSets allowable in this pool - if (pool_node->availableSets < p_alloc_info->descriptorSetCount) { + if (pool_state->availableSets < p_alloc_info->descriptorSetCount) { skip_call |= log_msg( report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_DESCRIPTOR_POOL_EXT, - reinterpret_cast(pool_node->pool), __LINE__, DRAWSTATE_DESCRIPTOR_POOL_EMPTY, "DS", + reinterpret_cast(pool_state->pool), __LINE__, DRAWSTATE_DESCRIPTOR_POOL_EMPTY, "DS", "Unable to allocate %u descriptorSets from pool 0x%" PRIxLEAST64 ". This pool only has %d descriptorSets remaining.", - p_alloc_info->descriptorSetCount, reinterpret_cast(pool_node->pool), pool_node->availableSets); + p_alloc_info->descriptorSetCount, reinterpret_cast(pool_state->pool), pool_state->availableSets); } // Determine whether descriptor counts are satisfiable for (uint32_t i = 0; i < VK_DESCRIPTOR_TYPE_RANGE_SIZE; i++) { - if (ds_data->required_descriptors_by_type[i] > pool_node->availableDescriptorTypeCount[i]) { + if (ds_data->required_descriptors_by_type[i] > pool_state->availableDescriptorTypeCount[i]) { skip_call |= log_msg(report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_DESCRIPTOR_POOL_EXT, - reinterpret_cast(pool_node->pool), __LINE__, DRAWSTATE_DESCRIPTOR_POOL_EMPTY, + reinterpret_cast(pool_state->pool), __LINE__, DRAWSTATE_DESCRIPTOR_POOL_EMPTY, "DS", "Unable to allocate %u descriptors of type %s from pool 0x%" PRIxLEAST64 ". This pool only has %d descriptors of this type remaining.", ds_data->required_descriptors_by_type[i], string_VkDescriptorType(VkDescriptorType(i)), - reinterpret_cast(pool_node->pool), pool_node->availableDescriptorTypeCount[i]); + reinterpret_cast(pool_state->pool), pool_state->availableDescriptorTypeCount[i]); } } -- cgit v1.2.3