summaryrefslogtreecommitdiff
path: root/layers
diff options
context:
space:
mode:
authorMark Lobodzinski <mark@lunarg.com>2017-04-13 14:25:39 -0600
committerMark Lobodzinski <mark@lunarg.com>2017-04-22 20:04:39 -0600
commit02a510945ff39f3d9e486e456aca5bfa6ea0c43a (patch)
treebecc9f0619a2f1b9dcb7211a15b9874931915dae /layers
parent0f409cc775674a446afc61daa091c82147959c3b (diff)
layers: Change obj type conversion routine name
Change-Id: I3b4208ca3777ac46b2c5ab2839c268ed4381a2ac
Diffstat (limited to 'layers')
-rw-r--r--layers/buffer_validation.cpp4
-rw-r--r--layers/core_validation.cpp8
-rw-r--r--layers/object_tracker.cpp10
3 files changed, 11 insertions, 11 deletions
diff --git a/layers/buffer_validation.cpp b/layers/buffer_validation.cpp
index 61054b75..4d60195e 100644
--- a/layers/buffer_validation.cpp
+++ b/layers/buffer_validation.cpp
@@ -2262,7 +2262,7 @@ static bool validate_usage_flags(layer_data *device_data, VkFlags actual, VkFlag
if (!correct_usage) {
if (msgCode == -1) {
// TODO: Fix callers with msgCode == -1 to use correct validation checks.
- skip = log_msg(report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, GetDebugReportEnum[obj_type], obj_handle, __LINE__,
+ skip = log_msg(report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, get_debug_report_enum[obj_type], obj_handle, __LINE__,
MEMTRACK_INVALID_USAGE_FLAG, "MEM",
"Invalid usage flag for %s 0x%" PRIxLEAST64
" used by %s. In this case, %s should have %s set during creation.",
@@ -2270,7 +2270,7 @@ static bool validate_usage_flags(layer_data *device_data, VkFlags actual, VkFlag
} else {
const char *valid_usage = (msgCode == -1) ? "" : validation_error_map[msgCode];
skip = log_msg(
- report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, GetDebugReportEnum[obj_type], obj_handle, __LINE__, msgCode, "MEM",
+ report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, get_debug_report_enum[obj_type], obj_handle, __LINE__, msgCode, "MEM",
"Invalid usage flag for %s 0x%" PRIxLEAST64 " used by %s. In this case, %s should have %s set during creation. %s",
type_str, obj_handle, func_name, type_str, usage_str, valid_usage);
}
diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp
index 560ea05b..15ca79ea 100644
--- a/layers/core_validation.cpp
+++ b/layers/core_validation.cpp
@@ -4305,8 +4305,8 @@ bool ValidImageBufferQueue(layer_data *dev_data, GLOBAL_CB_NODE *cb_node, const
}
if (!found) {
- skip = log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, GetDebugReportEnum[object->type], object->handle,
- __LINE__, DRAWSTATE_INVALID_QUEUE_FAMILY, "DS",
+ skip = log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, get_debug_report_enum[object->type],
+ object->handle, __LINE__, DRAWSTATE_INVALID_QUEUE_FAMILY, "DS",
"vkQueueSubmit: Command buffer 0x%" PRIxLEAST64 " contains %s 0x%" PRIxLEAST64
" which was not created allowing concurrent access to this queue family %d.",
reinterpret_cast<uint64_t>(cb_node->commandBuffer), object_string[object->type], object->handle,
@@ -4621,7 +4621,7 @@ bool ValidateObjectNotInUse(const layer_data *dev_data, BASE_NODE *obj_node, VK_
bool skip = false;
if (obj_node->in_use.load()) {
skip |=
- log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, GetDebugReportEnum[obj_struct.type], obj_struct.handle,
+ log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, get_debug_report_enum[obj_struct.type], obj_struct.handle,
__LINE__, error_code, "DS", "Cannot delete %s 0x%" PRIx64 " that is currently in use by a command buffer. %s",
object_string[obj_struct.type], obj_struct.handle, validation_error_map[error_code]);
}
@@ -4642,7 +4642,7 @@ static bool PreCallValidateFreeMemory(layer_data *dev_data, VkDeviceMemory mem,
static void PostCallRecordFreeMemory(layer_data *dev_data, VkDeviceMemory mem, DEVICE_MEM_INFO *mem_info, VK_OBJECT obj_struct) {
// Clear mem binding for any bound objects
for (auto obj : mem_info->obj_bindings) {
- log_msg(dev_data->report_data, VK_DEBUG_REPORT_INFORMATION_BIT_EXT, GetDebugReportEnum[obj.type], obj.handle, __LINE__,
+ log_msg(dev_data->report_data, VK_DEBUG_REPORT_INFORMATION_BIT_EXT, get_debug_report_enum[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)mem_info->mem);
switch (obj.type) {
diff --git a/layers/object_tracker.cpp b/layers/object_tracker.cpp
index 967b87af..541bc5dc 100644
--- a/layers/object_tracker.cpp
+++ b/layers/object_tracker.cpp
@@ -261,7 +261,7 @@ static void CreateObject(T1 dispatchable_object, T2 object, VulkanObjectType obj
bool custom_allocator = pAllocator != nullptr;
if (!instance_data->object_map[object_type].count(object_handle)) {
- VkDebugReportObjectTypeEXT debug_object_type = GetDebugReportEnum[object_type];
+ VkDebugReportObjectTypeEXT debug_object_type = get_debug_report_enum[object_type];
log_msg(instance_data->report_data, VK_DEBUG_REPORT_INFORMATION_BIT_EXT, debug_object_type, object_handle, __LINE__,
OBJTRACK_NONE, LayerName, "OBJ[0x%" PRIxLEAST64 "] : CREATE %s object 0x%" PRIxLEAST64, object_track_index++,
object_string[object_type], object_handle);
@@ -285,7 +285,7 @@ static void DestroyObject(T1 dispatchable_object, T2 object, VulkanObjectType ob
auto object_handle = handle_value(object);
bool custom_allocator = pAllocator != nullptr;
- VkDebugReportObjectTypeEXT debug_object_type = GetDebugReportEnum[object_type];
+ VkDebugReportObjectTypeEXT debug_object_type = get_debug_report_enum[object_type];
if (object_handle != VK_NULL_HANDLE) {
auto item = device_data->object_map[object_type].find(object_handle);
@@ -337,7 +337,7 @@ static bool ValidateObject(T1 dispatchable_object, T2 object, VulkanObjectType o
return false;
}
auto object_handle = handle_value(object);
- VkDebugReportObjectTypeEXT debug_object_type = GetDebugReportEnum[object_type];
+ VkDebugReportObjectTypeEXT debug_object_type = get_debug_report_enum[object_type];
layer_data *device_data = GetLayerDataPtr(get_dispatch_key(dispatchable_object), layer_data_map);
// Look for object in device object map
@@ -379,7 +379,7 @@ static void DeviceReportUndestroyedObjects(VkDevice device, VulkanObjectType obj
layer_data *device_data = GetLayerDataPtr(get_dispatch_key(device), layer_data_map);
for (auto item = device_data->object_map[object_type].begin(); item != device_data->object_map[object_type].end();) {
OBJTRACK_NODE *object_info = item->second;
- log_msg(device_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, GetDebugReportEnum[object_type], object_info->handle,
+ log_msg(device_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, get_debug_report_enum[object_type], object_info->handle,
__LINE__, error_code, LayerName,
"OBJ ERROR : For device 0x%" PRIxLEAST64 ", %s object 0x%" PRIxLEAST64 " has not been destroyed. %s",
reinterpret_cast<uint64_t>(device), object_string[object_type], object_info->handle,
@@ -414,7 +414,7 @@ VKAPI_ATTR void VKAPI_CALL DestroyInstance(VkInstance instance, const VkAllocati
OBJTRACK_NODE *pNode = iit->second;
VkDevice device = reinterpret_cast<VkDevice>(pNode->handle);
- VkDebugReportObjectTypeEXT debug_object_type = GetDebugReportEnum[pNode->object_type];
+ VkDebugReportObjectTypeEXT debug_object_type = get_debug_report_enum[pNode->object_type];
log_msg(instance_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, debug_object_type, pNode->handle, __LINE__,
OBJTRACK_OBJECT_LEAK, LayerName, "OBJ ERROR : %s object 0x%" PRIxLEAST64 " has not been destroyed.",