layers: Fix a couple of err enum probs found by accident
Change-Id: Ibdebf762561e5e0888c3c04e5047d9d879d5f45a
diff --git a/layers/object_tracker.cpp b/layers/object_tracker.cpp
index ec1bcae..acd518a 100644
--- a/layers/object_tracker.cpp
+++ b/layers/object_tracker.cpp
@@ -3299,7 +3299,8 @@
VkMemoryMapFlags flags, void **ppData) {
bool skip_call = VK_FALSE;
std::unique_lock<std::mutex> lock(global_lock);
- skip_call |= ValidateObject(device, device, VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT, false, VALIDATION_ERROR_00631);
+ skip_call |= ValidateObject(device, device, VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT, false, VALIDATION_ERROR_00630);
+ skip_call |= ValidateObject(device, memory, VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT, false, VALIDATION_ERROR_00631);
lock.unlock();
if (skip_call == VK_TRUE) {
return VK_ERROR_VALIDATION_FAILED_EXT;
@@ -3312,6 +3313,7 @@
bool skip_call = VK_FALSE;
std::unique_lock<std::mutex> lock(global_lock);
skip_call |= ValidateObject(device, device, VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT, false, VALIDATION_ERROR_00650);
+ skip_call |= ValidateObject(device, memory, VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT, false, VALIDATION_ERROR_00651);
lock.unlock();
if (skip_call == VK_TRUE) {
return;
diff --git a/layers/vk_validation_error_database.txt b/layers/vk_validation_error_database.txt
index 6f2a395..ed62d67 100644
--- a/layers/vk_validation_error_database.txt
+++ b/layers/vk_validation_error_database.txt
@@ -620,7 +620,7 @@
VALIDATION_ERROR_00627~^~U~^~Unknown~^~vkMapMemory~^~For more information refer to Vulkan Spec Section '10.2.1. Host Access to Device Memory Objects' which states 'If size is not equal to VK_WHOLE_SIZE, size must be greater than 0' (https://www.khronos.org/registry/vulkan/specs/1.0-extensions/xhtml/vkspec.html#memory-device-hostaccess-hazards)~^~
VALIDATION_ERROR_00628~^~U~^~Unknown~^~vkMapMemory~^~For more information refer to Vulkan Spec Section '10.2.1. Host Access to Device Memory Objects' which states 'If size is not equal to VK_WHOLE_SIZE, size must be less than or equal to the size of the memory minus offset' (https://www.khronos.org/registry/vulkan/specs/1.0-extensions/xhtml/vkspec.html#memory-device-hostaccess-hazards)~^~
VALIDATION_ERROR_00629~^~U~^~Unknown~^~vkMapMemory~^~For more information refer to Vulkan Spec Section '10.2.1. Host Access to Device Memory Objects' which states 'memory must have been created with a memory type that reports VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT' (https://www.khronos.org/registry/vulkan/specs/1.0-extensions/xhtml/vkspec.html#memory-device-hostaccess-hazards)~^~
-VALIDATION_ERROR_00630~^~U~^~Unknown~^~vkMapMemory~^~For more information refer to Vulkan Spec Section '10.2.1. Host Access to Device Memory Objects' which states 'device must be a valid VkDevice handle' (https://www.khronos.org/registry/vulkan/specs/1.0-extensions/xhtml/vkspec.html#memory-device-hostaccess-hazards)~^~
+VALIDATION_ERROR_00630~^~Y~^~Unknown~^~vkMapMemory~^~For more information refer to Vulkan Spec Section '10.2.1. Host Access to Device Memory Objects' which states 'device must be a valid VkDevice handle' (https://www.khronos.org/registry/vulkan/specs/1.0-extensions/xhtml/vkspec.html#memory-device-hostaccess-hazards)~^~
VALIDATION_ERROR_00631~^~Y~^~Unknown~^~vkMapMemory~^~For more information refer to Vulkan Spec Section '10.2.1. Host Access to Device Memory Objects' which states 'memory must be a valid VkDeviceMemory handle' (https://www.khronos.org/registry/vulkan/specs/1.0-extensions/xhtml/vkspec.html#memory-device-hostaccess-hazards)~^~
VALIDATION_ERROR_00632~^~U~^~Unknown~^~vkMapMemory~^~For more information refer to Vulkan Spec Section '10.2.1. Host Access to Device Memory Objects' which states 'flags must be 0' (https://www.khronos.org/registry/vulkan/specs/1.0-extensions/xhtml/vkspec.html#memory-device-hostaccess-hazards)~^~
VALIDATION_ERROR_00633~^~U~^~Unknown~^~vkMapMemory~^~For more information refer to Vulkan Spec Section '10.2.1. Host Access to Device Memory Objects' which states 'ppData must be a pointer to a pointer' (https://www.khronos.org/registry/vulkan/specs/1.0-extensions/xhtml/vkspec.html#memory-device-hostaccess-hazards)~^~
@@ -641,7 +641,7 @@
VALIDATION_ERROR_00648~^~Y~^~Unknown~^~vkInvalidateMappedMemoryRanges~^~For more information refer to Vulkan Spec Section '10.2.1. Host Access to Device Memory Objects' which states 'memory must be a valid VkDeviceMemory handle' (https://www.khronos.org/registry/vulkan/specs/1.0-extensions/xhtml/vkspec.html#VkMappedMemoryRange)~^~
VALIDATION_ERROR_00649~^~U~^~Unknown~^~vkUnmapMemory~^~For more information refer to Vulkan Spec Section '10.2.1. Host Access to Device Memory Objects' which states 'memory must currently be mapped' (https://www.khronos.org/registry/vulkan/specs/1.0-extensions/xhtml/vkspec.html#vkUnmapMemory)~^~
VALIDATION_ERROR_00650~^~Y~^~Unknown~^~vkUnmapMemory~^~For more information refer to Vulkan Spec Section '10.2.1. Host Access to Device Memory Objects' which states 'device must be a valid VkDevice handle' (https://www.khronos.org/registry/vulkan/specs/1.0-extensions/xhtml/vkspec.html#vkUnmapMemory)~^~
-VALIDATION_ERROR_00651~^~U~^~Unknown~^~vkUnmapMemory~^~For more information refer to Vulkan Spec Section '10.2.1. Host Access to Device Memory Objects' which states 'memory must be a valid VkDeviceMemory handle' (https://www.khronos.org/registry/vulkan/specs/1.0-extensions/xhtml/vkspec.html#vkUnmapMemory)~^~
+VALIDATION_ERROR_00651~^~Y~^~Unknown~^~vkUnmapMemory~^~For more information refer to Vulkan Spec Section '10.2.1. Host Access to Device Memory Objects' which states 'memory must be a valid VkDeviceMemory handle' (https://www.khronos.org/registry/vulkan/specs/1.0-extensions/xhtml/vkspec.html#vkUnmapMemory)~^~
VALIDATION_ERROR_00652~^~U~^~Unknown~^~vkUnmapMemory~^~For more information refer to Vulkan Spec Section '10.2.1. Host Access to Device Memory Objects' which states 'memory must have been created, allocated, or retrieved from device' (https://www.khronos.org/registry/vulkan/specs/1.0-extensions/xhtml/vkspec.html#vkUnmapMemory)~^~
VALIDATION_ERROR_00653~^~U~^~Unknown~^~vkGetDeviceMemoryCommitment~^~For more information refer to Vulkan Spec Section '10.2.2. Lazily Allocated Memory' which states 'memory must have been created with a memory type that reports VK_MEMORY_PROPERTY_LAZILY_ALLOCATED_BIT' (https://www.khronos.org/registry/vulkan/specs/1.0-extensions/xhtml/vkspec.html#vkGetDeviceMemoryCommitment)~^~
VALIDATION_ERROR_00654~^~Y~^~Unknown~^~vkGetDeviceMemoryCommitment~^~For more information refer to Vulkan Spec Section '10.2.2. Lazily Allocated Memory' which states 'device must be a valid VkDevice handle' (https://www.khronos.org/registry/vulkan/specs/1.0-extensions/xhtml/vkspec.html#vkGetDeviceMemoryCommitment)~^~