aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobin Ehlis <tobine@google.com>2016-10-20 10:14:38 -0600
committerTobin Ehlis <tobine@google.com>2016-10-25 21:20:16 -0600
commitf6b163ba3de27441b74b200a10285385e3f124c4 (patch)
treef6dd9d3bbb493360610f49589ab912b2483ed6f3
parentd74f8771414d9e80618cd7604ea4b1c459dfa42e (diff)
downloadvulkan-validation-layers-f6b163ba3de27441b74b200a10285385e3f124c4.tar.gz
layers:Variable renaming
Rename some vars from camelCase to lowercase to meet style guide. There was one line where we re-did a calculation that I updated to use the already calculated value.
-rw-r--r--layers/core_validation.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp
index 379b6e027..4c994f65b 100644
--- a/layers/core_validation.cpp
+++ b/layers/core_validation.cpp
@@ -678,34 +678,34 @@ static void clear_cmd_buf_and_mem_references(layer_data *dev_data, const VkComma
}
// For given MemObjInfo, report Obj & CB bindings. Clear any object bindings.
-static bool ReportMemReferencesAndCleanUp(layer_data *dev_data, DEVICE_MEM_INFO *pMemObjInfo) {
+static bool ReportMemReferencesAndCleanUp(layer_data *dev_data, DEVICE_MEM_INFO *mem_info) {
bool skip_call = false;
- size_t cmdBufRefCount = pMemObjInfo->cb_bindings.size();
- size_t objRefCount = pMemObjInfo->obj_bindings.size();
+ size_t cb_ref_count = mem_info->cb_bindings.size();
+ size_t obj_ref_count = mem_info->obj_bindings.size();
- if ((pMemObjInfo->cb_bindings.size()) != 0) {
+ if (cb_ref_count != 0) {
skip_call = log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT,
- (uint64_t)pMemObjInfo->mem, __LINE__, MEMTRACK_FREED_MEM_REF, "MEM",
+ (uint64_t)mem_info->mem, __LINE__, MEMTRACK_FREED_MEM_REF, "MEM",
"Attempting to free memory object 0x%" PRIxLEAST64 " which still contains " PRINTF_SIZE_T_SPECIFIER
" references",
- (uint64_t)pMemObjInfo->mem, (cmdBufRefCount + objRefCount));
+ (uint64_t)mem_info->mem, (cb_ref_count + obj_ref_count));
}
- if (cmdBufRefCount > 0 && pMemObjInfo->cb_bindings.size() > 0) {
- for (auto cb : pMemObjInfo->cb_bindings) {
+ if (cb_ref_count > 0 && mem_info->cb_bindings.size() > 0) {
+ for (auto cb : mem_info->cb_bindings) {
log_msg(dev_data->report_data, VK_DEBUG_REPORT_INFORMATION_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_BUFFER_EXT,
(uint64_t)cb, __LINE__, MEMTRACK_FREED_MEM_REF, "MEM",
- "Command Buffer 0x%p still has a reference to mem obj 0x%" PRIxLEAST64, cb, (uint64_t)pMemObjInfo->mem);
+ "Command Buffer 0x%p still has a reference to mem obj 0x%" PRIxLEAST64, cb, (uint64_t)mem_info->mem);
}
// Clear the list of hanging references
- pMemObjInfo->cb_bindings.clear();
+ mem_info->cb_bindings.clear();
}
- if (objRefCount > 0 && pMemObjInfo->obj_bindings.size() > 0) {
- for (auto obj : pMemObjInfo->obj_bindings) {
+ if (obj_ref_count > 0 && mem_info->obj_bindings.size() > 0) {
+ for (auto obj : mem_info->obj_bindings) {
log_msg(dev_data->report_data, VK_DEBUG_REPORT_INFORMATION_BIT_EXT, obj.type, obj.handle, __LINE__,
MEMTRACK_FREED_MEM_REF, "MEM", "VK Object 0x%" PRIxLEAST64 " still has a reference to mem obj 0x%" PRIxLEAST64,
- obj.handle, (uint64_t)pMemObjInfo->mem);
+ obj.handle, (uint64_t)mem_info->mem);
// Clear mem binding for bound objects
switch (obj.type) {
case VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT: {
@@ -726,7 +726,7 @@ static bool ReportMemReferencesAndCleanUp(layer_data *dev_data, DEVICE_MEM_INFO
}
}
// Clear the list of hanging references
- pMemObjInfo->obj_bindings.clear();
+ mem_info->obj_bindings.clear();
}
return skip_call;
}