aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Forbes <chrisforbes@google.com>2017-06-12 11:20:45 -0700
committerChris Forbes <chrisf@ijw.co.nz>2017-06-12 14:38:54 -0700
commit70899db351f40ae0b4d2cc1229f34a355ba9e729 (patch)
tree40dda71f4a5fbe1c0ea8d87cd85cac96ee940731
parent6bece671dd716f15665879c86b955b505621e5cb (diff)
downloadusermoji-70899db351f40ae0b4d2cc1229f34a355ba9e729.tar.xz
layers: Fix parameter order for validateQuery
This was reversed from every case of these two parameters in the API, which was confusing.
-rw-r--r--layers/core_validation.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp
index 60639a50..f63eb9ab 100644
--- a/layers/core_validation.cpp
+++ b/layers/core_validation.cpp
@@ -6604,7 +6604,7 @@ VKAPI_ATTR void VKAPI_CALL CmdResetQueryPool(VkCommandBuffer commandBuffer, VkQu
{HandleToUint64(queryPool), kVulkanObjectTypeQueryPool}, cb_state);
}
-bool validateQuery(VkQueue queue, GLOBAL_CB_NODE *pCB, VkQueryPool queryPool, uint32_t queryCount, uint32_t firstQuery) {
+bool validateQuery(VkQueue queue, GLOBAL_CB_NODE *pCB, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount) {
bool skip = false;
layer_data *dev_data = GetLayerDataPtr(get_dispatch_key(pCB->commandBuffer), layer_data_map);
auto queue_data = dev_data->queueMap.find(queue);
@@ -6660,7 +6660,7 @@ VKAPI_ATTR void VKAPI_CALL CmdCopyQueryPoolResults(VkCommandBuffer commandBuffer
};
cb_node->validate_functions.push_back(function);
std::function<bool(VkQueue)> query_update =
- std::bind(validateQuery, std::placeholders::_1, cb_node, queryPool, queryCount, firstQuery);
+ std::bind(validateQuery, std::placeholders::_1, cb_node, queryPool, firstQuery, queryCount);
cb_node->queryUpdates.push_back(query_update);
skip |= ValidateCmdQueueFlags(dev_data, cb_node, "vkCmdCopyQueryPoolResults()",
VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT, VALIDATION_ERROR_19402415);