corechecks: Renamed GetCommandPoolNode function
To GetCommandPoolState.
Change-Id: I9cdd1f5582ab1f46c369cbb6a42ffcfdbaef8967
diff --git a/layers/buffer_validation.cpp b/layers/buffer_validation.cpp
index f7c0eeb..83eb4a5 100644
--- a/layers/buffer_validation.cpp
+++ b/layers/buffer_validation.cpp
@@ -820,7 +820,7 @@
bool CoreChecks::IsReleaseOp(CMD_BUFFER_STATE *cb_state, VkImageMemoryBarrier const *barrier) {
if (!IsTransferOp(barrier)) return false;
- auto pool = GetCommandPoolNode(cb_state->createInfo.commandPool);
+ auto pool = GetCommandPoolState(cb_state->createInfo.commandPool);
return pool && TempIsReleaseOp<VkImageMemoryBarrier, true>(pool, barrier);
}
@@ -829,7 +829,7 @@
const Barrier *barriers) {
using BarrierRecord = QFOTransferBarrier<Barrier>;
bool skip = false;
- auto pool = GetCommandPoolNode(cb_state->createInfo.commandPool);
+ auto pool = GetCommandPoolState(cb_state->createInfo.commandPool);
auto &barrier_sets = GetQFOBarrierSets(cb_state, typename BarrierRecord::Tag());
const char *barrier_name = BarrierRecord::BarrierName();
const char *handle_name = BarrierRecord::HandleName();
@@ -867,7 +867,7 @@
template <typename Barrier>
void CoreChecks::RecordQFOTransferBarriers(CMD_BUFFER_STATE *cb_state, uint32_t barrier_count, const Barrier *barriers) {
- auto pool = GetCommandPoolNode(cb_state->createInfo.commandPool);
+ auto pool = GetCommandPoolState(cb_state->createInfo.commandPool);
auto &barrier_sets = GetQFOBarrierSets(cb_state, typename QFOTransferBarrier<Barrier>::Tag());
for (uint32_t b = 0; b < barrier_count; b++) {
if (!IsTransferOp(&barriers[b])) continue;
@@ -1857,7 +1857,7 @@
VkExtent3D CoreChecks::GetScaledItg(const CMD_BUFFER_STATE *cb_node, const IMAGE_STATE *img) {
// Default to (0, 0, 0) granularity in case we can't find the real granularity for the physical device.
VkExtent3D granularity = {0, 0, 0};
- auto pPool = GetCommandPoolNode(cb_node->createInfo.commandPool);
+ auto pPool = GetCommandPoolState(cb_node->createInfo.commandPool);
if (pPool) {
granularity = GetPhysicalDeviceState()->queue_family_properties[pPool->queueFamilyIndex].minImageTransferGranularity;
if (FormatIsCompressed(img->createInfo.format)) {
@@ -4737,7 +4737,7 @@
skip |= ValidateCmd(cb_node, CMD_COPYIMAGETOBUFFER, "vkCmdCopyImageToBuffer()");
// Command pool must support graphics, compute, or transfer operations
- auto pPool = GetCommandPoolNode(cb_node->createInfo.commandPool);
+ auto pPool = GetCommandPoolState(cb_node->createInfo.commandPool);
VkQueueFlags queue_flags = GetPhysicalDeviceState()->queue_family_properties[pPool->queueFamilyIndex].queueFlags;
@@ -4821,7 +4821,7 @@
skip |= ValidateCmd(cb_node, CMD_COPYBUFFERTOIMAGE, "vkCmdCopyBufferToImage()");
// Command pool must support graphics, compute, or transfer operations
- auto pPool = GetCommandPoolNode(cb_node->createInfo.commandPool);
+ auto pPool = GetCommandPoolState(cb_node->createInfo.commandPool);
VkQueueFlags queue_flags = GetPhysicalDeviceState()->queue_family_properties[pPool->queueFamilyIndex].queueFlags;
if (0 == (queue_flags & (VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_TRANSFER_BIT))) {
skip |= log_msg(report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_BUFFER_EXT,
diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp
index eb1ce50..40f2bb3 100644
--- a/layers/core_validation.cpp
+++ b/layers/core_validation.cpp
@@ -223,7 +223,7 @@
return &it->second;
}
-COMMAND_POOL_STATE *CoreChecks::GetCommandPoolNode(VkCommandPool pool) {
+COMMAND_POOL_STATE *CoreChecks::GetCommandPoolState(VkCommandPool pool) {
auto it = commandPoolMap.find(pool);
if (it == commandPoolMap.end()) {
return nullptr;
@@ -1942,7 +1942,7 @@
bool CoreChecks::ValidateCmdQueueFlags(const CMD_BUFFER_STATE *cb_node, const char *caller_name, VkQueueFlags required_flags,
const char *error_code) {
- auto pool = GetCommandPoolNode(cb_node->createInfo.commandPool);
+ auto pool = GetCommandPoolState(cb_node->createInfo.commandPool);
if (pool) {
VkQueueFlags queue_flags = GetPhysicalDeviceState()->queue_family_properties[pool->queueFamilyIndex].queueFlags;
if (!(required_flags & queue_flags)) {
@@ -2183,7 +2183,7 @@
break;
}
case kVulkanObjectTypeCommandPool: {
- base_ptr = GetCommandPoolNode(reinterpret_cast<VkCommandPool &>(object_struct.handle));
+ base_ptr = GetCommandPoolState(reinterpret_cast<VkCommandPool &>(object_struct.handle));
break;
}
case kVulkanObjectTypeFramebuffer: {
@@ -3042,7 +3042,7 @@
// Secondary command buffers were previously validated in vkCmdExecuteCommands().
bool CoreChecks::ValidateQueueFamilyIndices(CMD_BUFFER_STATE *pCB, VkQueue queue) {
bool skip = false;
- auto pPool = GetCommandPoolNode(pCB->createInfo.commandPool);
+ auto pPool = GetCommandPoolState(pCB->createInfo.commandPool);
auto queue_state = GetQueueState(queue);
if (pPool && queue_state) {
@@ -4870,7 +4870,7 @@
void CoreChecks::PreCallRecordFreeCommandBuffers(VkDevice device, VkCommandPool commandPool, uint32_t commandBufferCount,
const VkCommandBuffer *pCommandBuffers) {
- auto pPool = GetCommandPoolNode(commandPool);
+ auto pPool = GetCommandPoolState(commandPool);
FreeCommandBufferStates(pPool, commandBufferCount, pCommandBuffers);
}
@@ -4912,7 +4912,7 @@
bool CoreChecks::PreCallValidateDestroyCommandPool(VkDevice device, VkCommandPool commandPool,
const VkAllocationCallbacks *pAllocator) {
- COMMAND_POOL_STATE *cp_state = GetCommandPoolNode(commandPool);
+ COMMAND_POOL_STATE *cp_state = GetCommandPoolState(commandPool);
bool skip = false;
if (cp_state) {
// Verify that command buffers in pool are complete (not in-flight)
@@ -4924,7 +4924,7 @@
void CoreChecks::PreCallRecordDestroyCommandPool(VkDevice device, VkCommandPool commandPool,
const VkAllocationCallbacks *pAllocator) {
if (!commandPool) return;
- COMMAND_POOL_STATE *cp_state = GetCommandPoolNode(commandPool);
+ COMMAND_POOL_STATE *cp_state = GetCommandPoolState(commandPool);
// Remove cmdpool from cmdpoolmap, after freeing layer data for the command buffers
// "When a pool is destroyed, all command buffers allocated from the pool are freed."
if (cp_state) {
@@ -4936,7 +4936,7 @@
}
bool CoreChecks::PreCallValidateResetCommandPool(VkDevice device, VkCommandPool commandPool, VkCommandPoolResetFlags flags) {
- auto command_pool_state = GetCommandPoolNode(commandPool);
+ auto command_pool_state = GetCommandPoolState(commandPool);
return CheckCommandBuffersInFlight(command_pool_state, "reset command pool with", "VUID-vkResetCommandPool-commandPool-00040");
}
@@ -4944,7 +4944,7 @@
VkResult result) {
if (VK_SUCCESS != result) return;
// Reset all of the CBs allocated from this pool
- auto command_pool_state = GetCommandPoolNode(commandPool);
+ auto command_pool_state = GetCommandPoolState(commandPool);
for (auto cmdBuffer : command_pool_state->commandBuffers) {
ResetCommandBufferState(cmdBuffer);
}
@@ -6163,7 +6163,7 @@
void CoreChecks::PostCallRecordAllocateCommandBuffers(VkDevice device, const VkCommandBufferAllocateInfo *pCreateInfo,
VkCommandBuffer *pCommandBuffer, VkResult result) {
if (VK_SUCCESS != result) return;
- auto pPool = GetCommandPoolNode(pCreateInfo->commandPool);
+ auto pPool = GetCommandPoolState(pCreateInfo->commandPool);
if (pPool) {
for (uint32_t i = 0; i < pCreateInfo->commandBufferCount; i++) {
// Add command buffer to its commandPool map
@@ -6256,7 +6256,7 @@
report_data->FormatHandle(commandBuffer).c_str());
} else if (CB_RECORDED == cb_state->state || CB_INVALID_COMPLETE == cb_state->state) {
VkCommandPool cmdPool = cb_state->createInfo.commandPool;
- auto pPool = GetCommandPoolNode(cmdPool);
+ auto pPool = GetCommandPoolState(cmdPool);
if (!(VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT & pPool->createFlags)) {
skip |=
log_msg(report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_BUFFER_EXT,
@@ -6362,7 +6362,7 @@
CMD_BUFFER_STATE *pCB = GetCBNode(commandBuffer);
if (!pCB) return false;
VkCommandPool cmdPool = pCB->createInfo.commandPool;
- auto pPool = GetCommandPoolNode(cmdPool);
+ auto pPool = GetCommandPoolState(cmdPool);
if (!(VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT & pPool->createFlags)) {
skip |= log_msg(report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_BUFFER_EXT,
@@ -7031,7 +7031,7 @@
bool CoreChecks::ValidatePipelineBindPoint(CMD_BUFFER_STATE *cb_state, VkPipelineBindPoint bind_point, const char *func_name,
const std::map<VkPipelineBindPoint, std::string> &bind_errors) {
bool skip = false;
- auto pool = GetCommandPoolNode(cb_state->createInfo.commandPool);
+ auto pool = GetCommandPoolState(cb_state->createInfo.commandPool);
if (pool) { // The loss of a pool in a recording cmd is reported in DestroyCommandPool
static const std::map<VkPipelineBindPoint, VkQueueFlags> flag_mask = {
std::make_pair(VK_PIPELINE_BIND_POINT_GRAPHICS, static_cast<VkQueueFlags>(VK_QUEUE_GRAPHICS_BIT)),
@@ -8250,7 +8250,7 @@
const VkBufferMemoryBarrier *buffer_barriers,
uint32_t image_barrier_count,
const VkImageMemoryBarrier *image_barriers) {
- auto pool = GetCommandPoolNode(cb_state->createInfo.commandPool);
+ auto pool = GetCommandPoolState(cb_state->createInfo.commandPool);
BarrierOperationsType op_type = kGeneral;
// Look at the barrier details only if they exist
@@ -10241,8 +10241,8 @@
}
}
}
- auto primary_pool = GetCommandPoolNode(pCB->createInfo.commandPool);
- auto secondary_pool = GetCommandPoolNode(pSubCB->createInfo.commandPool);
+ auto primary_pool = GetCommandPoolState(pCB->createInfo.commandPool);
+ auto secondary_pool = GetCommandPoolState(pSubCB->createInfo.commandPool);
if (primary_pool && secondary_pool && (primary_pool->queueFamilyIndex != secondary_pool->queueFamilyIndex)) {
skip |= log_msg(report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_BUFFER_EXT,
HandleToUint64(pSubCB->commandBuffer), kVUID_Core_DrawState_InvalidQueueFamily,
diff --git a/layers/core_validation.h b/layers/core_validation.h
index 7657eef..81badff 100644
--- a/layers/core_validation.h
+++ b/layers/core_validation.h
@@ -252,7 +252,7 @@
RENDER_PASS_STATE* GetRenderPassState(VkRenderPass renderpass);
std::shared_ptr<RENDER_PASS_STATE> GetRenderPassStateSharedPtr(VkRenderPass renderpass);
FRAMEBUFFER_STATE* GetFramebufferState(VkFramebuffer framebuffer);
- COMMAND_POOL_STATE* GetCommandPoolNode(VkCommandPool pool);
+ COMMAND_POOL_STATE* GetCommandPoolState(VkCommandPool pool);
SHADER_MODULE_STATE const* GetShaderModuleState(VkShaderModule module);
FENCE_STATE* GetFenceNode(VkFence fence);
EVENT_STATE* GetEventNode(VkEvent event);