build: Address VUID inconsistencies for 1.2.147
`VUID-vkGetBufferMemoryRequirements-buffer-04003` and
`VUID-VkBufferMemoryRequirementsInfo2-buffer-04005` were removed. All
related tests and functions were removed.
Changed VUIDs in comments so `vk_validation_stats.py` doesn't pick them
up as errors.
Change-Id: Icdd4efc3a448bd9c942093915b060583a72c7fcd
diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp
index 665d8dd..849df9c 100644
--- a/layers/core_validation.cpp
+++ b/layers/core_validation.cpp
@@ -737,7 +737,7 @@
bool dynViewportCount = IsDynamic(pPipeline, VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT_EXT);
bool dynScissorCount = IsDynamic(pPipeline, VK_DYNAMIC_STATE_SCISSOR_WITH_COUNT_EXT);
- // VUID-{refpage}-viewportCount-03417
+ // VUID {refpage}-viewportCount-03417
if (dynViewportCount && !dynScissorCount) {
const auto requiredViewportMask = (1 << pPipeline->graphicsPipelineCI.pViewportState->scissorCount) - 1;
const auto missingViewportMask = ~pCB->viewportWithCountMask & requiredViewportMask;
@@ -750,7 +750,7 @@
}
}
- // VUID-{refpage}-scissorCount-03418
+ // VUID {refpage}-scissorCount-03418
if (dynScissorCount && !dynViewportCount) {
const auto requiredScissorMask = (1 << pPipeline->graphicsPipelineCI.pViewportState->viewportCount) - 1;
const auto missingScissorMask = ~pCB->scissorWithCountMask & requiredScissorMask;
@@ -763,7 +763,7 @@
}
}
- // VUID-{refpage}-viewportCount-03419
+ // VUID {refpage}-viewportCount-03419
if (dynScissorCount && dynViewportCount) {
if (pCB->viewportWithCountMask != pCB->scissorWithCountMask) {
std::stringstream ss;
@@ -854,7 +854,7 @@
}
}
- // VUID-{refpage}-primitiveTopology-03420
+ // VUID {refpage}-primitiveTopology-03420
skip |= ValidateStatus(pCB, CBSTATUS_PRIMITIVE_TOPOLOGY_SET, "Dynamic primitive topology state not set for this command buffer",
vuid.primitive_topology);
if (IsDynamic(pPipeline, VK_DYNAMIC_STATE_PRIMITIVE_TOPOLOGY_EXT)) {
@@ -3059,26 +3059,6 @@
return skip;
}
-bool CoreChecks::ValidateGetBufferMemoryRequirementsANDROID(const VkBuffer buffer, const char *func_name) const {
- bool skip = false;
-
- const BUFFER_STATE *buffer_state = GetBufferState(buffer);
- if (buffer_state != nullptr) {
- if (buffer_state->external_ahb && (0 == buffer_state->GetBoundMemory().size())) {
- const char *vuid = strcmp(func_name, "vkGetBufferMemoryRequirements()") == 0
- ? "VUID-vkGetBufferMemoryRequirements-buffer-04003"
- : "VUID-VkBufferMemoryRequirementsInfo2-buffer-04005";
- skip |=
- LogError(buffer, vuid,
- "%s: Attempt get buffer memory requirements for a buffer created with a "
- "VK_EXTERNAL_MEMORY_HANDLE_TYPE_ANDROID_HARDWARE_BUFFER_BIT_ANDROID handleType, which has not yet been "
- "bound to memory.",
- func_name);
- }
- }
- return skip;
-}
-
bool CoreChecks::ValidateGetPhysicalDeviceImageFormatProperties2ANDROID(
const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo, const VkImageFormatProperties2 *pImageFormatProperties) const {
bool skip = false;
@@ -3145,8 +3125,6 @@
bool CoreChecks::ValidateGetImageMemoryRequirementsANDROID(const VkImage image, const char *func_name) const { return false; }
-bool CoreChecks::ValidateGetBufferMemoryRequirementsANDROID(const VkBuffer buffer, const char *func_name) const { return false; }
-
bool CoreChecks::ValidateBufferImportedHandleANDROID(const char *func_name, VkExternalMemoryHandleTypeFlags handleType,
VkDeviceMemory memory, VkBuffer buffer) const {
return false;
@@ -3957,33 +3935,6 @@
return ValidateGetImageMemoryRequirements2(pInfo, "vkGetImageMemoryRequirements2KHR()");
}
-bool CoreChecks::PreCallValidateGetBufferMemoryRequirements(VkDevice device, VkBuffer buffer,
- VkMemoryRequirements *pMemoryRequirements) const {
- bool skip = false;
- if (device_extensions.vk_android_external_memory_android_hardware_buffer) {
- skip |= ValidateGetBufferMemoryRequirementsANDROID(buffer, "vkGetBufferMemoryRequirements()");
- }
- return skip;
-}
-
-bool CoreChecks::ValidateGetBufferMemoryRequirements2(const VkBufferMemoryRequirementsInfo2 *pInfo, const char *func_name) const {
- bool skip = false;
- if (device_extensions.vk_android_external_memory_android_hardware_buffer) {
- skip |= ValidateGetBufferMemoryRequirementsANDROID(pInfo->buffer, func_name);
- }
- return skip;
-}
-
-bool CoreChecks::PreCallValidateGetBufferMemoryRequirements2(VkDevice device, const VkBufferMemoryRequirementsInfo2 *pInfo,
- VkMemoryRequirements2 *pMemoryRequirements) const {
- return ValidateGetBufferMemoryRequirements2(pInfo, "vkGetBufferMemoryRequirements2()");
-}
-
-bool CoreChecks::PreCallValidateGetBufferMemoryRequirements2KHR(VkDevice device, const VkBufferMemoryRequirementsInfo2 *pInfo,
- VkMemoryRequirements2 *pMemoryRequirements) const {
- return ValidateGetBufferMemoryRequirements2(pInfo, "vkGetBufferMemoryRequirements2KHR()");
-}
-
bool CoreChecks::PreCallValidateGetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice physicalDevice,
const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo,
VkImageFormatProperties2 *pImageFormatProperties) const {
diff --git a/layers/core_validation.h b/layers/core_validation.h
index f86fea8..4c6f683 100644
--- a/layers/core_validation.h
+++ b/layers/core_validation.h
@@ -85,7 +85,6 @@
bool optional) const;
bool ValidateBindBufferMemory(VkBuffer buffer, VkDeviceMemory mem, VkDeviceSize memoryOffset, const char* api_name) const;
bool ValidateGetImageMemoryRequirements2(const VkImageMemoryRequirementsInfo2* pInfo, const char* func_name) const;
- bool ValidateGetBufferMemoryRequirements2(const VkBufferMemoryRequirementsInfo2* pInfo, const char* func_name) const;
bool CheckCommandBuffersInFlight(const COMMAND_POOL_STATE* pPool, const char* action, const char* error_code) const;
bool CheckCommandBufferInFlight(const CMD_BUFFER_STATE* cb_node, const char* action, const char* error_code) const;
bool VerifyQueueStateToFence(VkFence fence) const;
@@ -704,7 +703,6 @@
bool optional) const;
bool ValidateAllocateMemoryANDROID(const VkMemoryAllocateInfo* alloc_info) const;
bool ValidateGetImageMemoryRequirementsANDROID(const VkImage image, const char* func_name) const;
- bool ValidateGetBufferMemoryRequirementsANDROID(const VkBuffer buffer, const char* func_name) const;
bool ValidateGetPhysicalDeviceImageFormatProperties2ANDROID(const VkPhysicalDeviceImageFormatInfo2* pImageFormatInfo,
const VkImageFormatProperties2* pImageFormatProperties) const;
bool ValidateBufferImportedHandleANDROID(const char* func_name, VkExternalMemoryHandleTypeFlags handleType,
@@ -832,12 +830,6 @@
VkMemoryRequirements2* pMemoryRequirements) const;
bool PreCallValidateGetImageMemoryRequirements2KHR(VkDevice device, const VkImageMemoryRequirementsInfo2* pInfo,
VkMemoryRequirements2* pMemoryRequirements) const;
- bool PreCallValidateGetBufferMemoryRequirements(VkDevice device, VkBuffer buffer,
- VkMemoryRequirements* pMemoryRequirements) const;
- bool PreCallValidateGetBufferMemoryRequirements2(VkDevice device, const VkBufferMemoryRequirementsInfo2* pInfo,
- VkMemoryRequirements2* pMemoryRequirements) const;
- bool PreCallValidateGetBufferMemoryRequirements2KHR(VkDevice device, const VkBufferMemoryRequirementsInfo2* pInfo,
- VkMemoryRequirements2* pMemoryRequirements) const;
bool PreCallValidateGetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice physicalDevice,
const VkPhysicalDeviceImageFormatInfo2* pImageFormatInfo,
VkImageFormatProperties2* pImageFormatProperties) const;
diff --git a/tests/vklayertests_others.cpp b/tests/vklayertests_others.cpp
index 0db69bd..bd797c4 100644
--- a/tests/vklayertests_others.cpp
+++ b/tests/vklayertests_others.cpp
@@ -5584,69 +5584,6 @@
vk::DestroyImage(dev, img, NULL);
}
-TEST_F(VkLayerTest, AndroidHardwareBufferUnboundBuffer) {
- TEST_DESCRIPTION("Verify AndroidHardwareBuffer can't be queried for mem requirements while unbound.");
-
- SetTargetApiVersion(VK_API_VERSION_1_1);
- ASSERT_NO_FATAL_FAILURE(InitFramework(m_errorMonitor));
-
- if ((DeviceExtensionSupported(gpu(), nullptr, VK_ANDROID_EXTERNAL_MEMORY_ANDROID_HARDWARE_BUFFER_EXTENSION_NAME)) &&
- // Also skip on devices that advertise AHB, but not the pre-requisite foreign_queue extension
- (DeviceExtensionSupported(gpu(), nullptr, VK_EXT_QUEUE_FAMILY_FOREIGN_EXTENSION_NAME))) {
- m_device_extension_names.push_back(VK_ANDROID_EXTERNAL_MEMORY_ANDROID_HARDWARE_BUFFER_EXTENSION_NAME);
- m_device_extension_names.push_back(VK_KHR_SAMPLER_YCBCR_CONVERSION_EXTENSION_NAME);
- m_device_extension_names.push_back(VK_KHR_MAINTENANCE1_EXTENSION_NAME);
- m_device_extension_names.push_back(VK_KHR_BIND_MEMORY_2_EXTENSION_NAME);
- m_device_extension_names.push_back(VK_KHR_GET_MEMORY_REQUIREMENTS_2_EXTENSION_NAME);
- m_device_extension_names.push_back(VK_KHR_EXTERNAL_MEMORY_EXTENSION_NAME);
- m_device_extension_names.push_back(VK_EXT_QUEUE_FAMILY_FOREIGN_EXTENSION_NAME);
- } else {
- printf("%s %s extension not supported, skipping tests\n", kSkipPrefix,
- VK_ANDROID_EXTERNAL_MEMORY_ANDROID_HARDWARE_BUFFER_EXTENSION_NAME);
- return;
- }
-
- ASSERT_NO_FATAL_FAILURE(InitState());
-
- VkExternalMemoryBufferCreateInfo ext_buf_info = {};
- ext_buf_info.sType = VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_BUFFER_CREATE_INFO_KHR;
- ext_buf_info.handleTypes = VK_EXTERNAL_MEMORY_HANDLE_TYPE_ANDROID_HARDWARE_BUFFER_BIT_ANDROID;
-
- VkBufferCreateInfo buffer_create_info = {};
- buffer_create_info.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO;
- buffer_create_info.pNext = &ext_buf_info;
- buffer_create_info.size = 512;
- buffer_create_info.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT;
-
- VkBuffer buffer = VK_NULL_HANDLE;
- vk::CreateBuffer(m_device->device(), &buffer_create_info, nullptr, &buffer);
-
- // Try to get memory requirements prior to binding memory
- VkMemoryRequirements mem_reqs;
- m_errorMonitor->SetDesiredFailureMsg(kErrorBit, "VUID-vkGetBufferMemoryRequirements-buffer-04003");
- vk::GetBufferMemoryRequirements(m_device->device(), buffer, &mem_reqs);
- m_errorMonitor->VerifyFound();
-
- // Tests consecutive calls
- m_errorMonitor->SetDesiredFailureMsg(kErrorBit, "VUID-vkGetBufferMemoryRequirements-buffer-04003");
- vk::GetBufferMemoryRequirements(m_device->device(), buffer, &mem_reqs);
- m_errorMonitor->VerifyFound();
-
- // Test bind memory 2 extension
- VkBufferMemoryRequirementsInfo2 buffer_mem_reqs2 = {};
- buffer_mem_reqs2.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_REQUIREMENTS_INFO_2;
- buffer_mem_reqs2.pNext = nullptr;
- buffer_mem_reqs2.buffer = buffer;
- VkMemoryRequirements2 mem_reqs2;
- mem_reqs2.sType = VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2;
- mem_reqs2.pNext = nullptr;
- m_errorMonitor->SetDesiredFailureMsg(kErrorBit, "VUID-VkBufferMemoryRequirementsInfo2-buffer-04005");
- vk::GetBufferMemoryRequirements2(m_device->device(), &buffer_mem_reqs2, &mem_reqs2);
- m_errorMonitor->VerifyFound();
-
- vk::DestroyBuffer(m_device->device(), buffer, nullptr);
-}
-
TEST_F(VkLayerTest, AndroidHardwareBufferImportBufferHandleType) {
TEST_DESCRIPTION("Don't use proper resource handleType for import buffer");
