Remove LOG_TRAP
The Vulkan spec is being clarified to make the legality of unsupported
extension structs unambiguous:
Any component of the implementation (the loader, any enabled layers,
and drivers) must skip over, without processing (other than reading
the sType and pNext members) any extending structures in the chain
not defined by core versions or extensions supported by that
component. However, applications must not include in the chain any
extending structures that are defined by a core version or extension
supported by the implementation unless the extension or feature is
enabled.
So, LOG_TRAP isn't useful and all uses of it are replaced with the
UNSUPPORTED macro.
Bug: b/176893525
Change-Id: I29ef11b8ce679042402fd682d864fb86bd6392d1
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/53528
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Kokoro-Result: kokoro <noreply+kokoro@google.com>
Tested-by: Sean Risser <srisser@google.com>
Commit-Queue: Sean Risser <srisser@google.com>
diff --git a/src/Device/Context.cpp b/src/Device/Context.cpp
index 355e3a4..6b3fd5b 100644
--- a/src/Device/Context.cpp
+++ b/src/Device/Context.cpp
@@ -379,8 +379,14 @@
depthClipEnable = depthClipInfo->depthClipEnable != VK_FALSE;
}
break;
+ case VK_STRUCTURE_TYPE_APPLICATION_INFO:
+ // SwiftShader doesn't interact with application info, but dEQP includes it
+ break;
+ case VK_STRUCTURE_TYPE_MAX_ENUM:
+ // dEQP tests that this value is ignored.
+ break;
default:
- WARN("pCreateInfo->pRasterizationState->pNext sType = %s", vk::Stringify(extensionCreateInfo->sType).c_str());
+ UNSUPPORTED("pCreateInfo->pRasterizationState->pNext sType = %s", vk::Stringify(extensionCreateInfo->sType).c_str());
break;
}
diff --git a/src/System/Debug.cpp b/src/System/Debug.cpp
index b0bb7f3..ce86d1c 100644
--- a/src/System/Debug.cpp
+++ b/src/System/Debug.cpp
@@ -44,58 +44,6 @@
namespace {
-bool IsUnderDebugger()
-{
-#if defined(PTRACE) && !defined(__APPLE__) && !defined(__MACH__)
- static bool checked = false;
- static bool res = false;
-
- if(!checked)
- {
- // If a debugger is attached then we're already being ptraced and ptrace
- // will return a non-zero value.
- checked = true;
- if(ptrace(PTRACE_TRACEME, 0, 1, 0) != 0)
- {
- res = true;
- }
- else
- {
- ptrace(PTRACE_DETACH, 0, 1, 0);
- }
- }
-
- return res;
-#elif defined(_WIN32) || defined(_WIN64)
- return IsDebuggerPresent() != 0;
-#elif defined(__APPLE__) || defined(__MACH__)
- // Code comes from the Apple Technical Q&A QA1361
-
- // Tell sysctl what info we're requestion. Specifically we're asking for
- // info about this our PID.
- int res = 0;
- int request[4] = {
- CTL_KERN,
- KERN_PROC,
- KERN_PROC_PID,
- getpid()
- };
- struct kinfo_proc info;
- size_t size = sizeof(info);
-
- info.kp_proc.p_flag = 0;
-
- // Get the info we're requesting, if sysctl fails then info.kp_proc.p_flag will remain 0.
- res = sysctl(request, sizeof(request) / sizeof(*request), &info, &size, NULL, 0);
- ASSERT_MSG(res == 0, "syscl returned %d", res);
-
- // We're being debugged if the P_TRACED flag is set
- return ((info.kp_proc.p_flag & P_TRACED) != 0);
-#else
- return false;
-#endif
-}
-
enum class Level
{
Verbose,
@@ -214,29 +162,4 @@
::abort();
}
-void log_trap(const char *format, ...)
-{
- // If enabled, log_assert will log all messages, and otherwise ignore them
- // unless a debugger is attached.
- static std::atomic<bool> asserted = { false };
- if(IsUnderDebugger() && !asserted.exchange(true) && static_cast<int>(Level::Debug) >= static_cast<int>(Level::SWIFTSHADER_LOGGING_LEVEL))
- {
- // If a developer wants to be aware of what's happening,
- // then we abort after tracing and printing to stderr
- va_list vararg;
- va_start(vararg, format);
- logv(Level::Fatal, format, vararg);
- va_end(vararg);
-
- ::abort();
- }
- else if(!asserted)
- {
- va_list vararg;
- va_start(vararg, format);
- logv(Level::Verbose, format, vararg);
- va_end(vararg);
- }
-}
-
} // namespace sw
diff --git a/src/System/Debug.hpp b/src/System/Debug.hpp
index 69bb4e4..10457b3 100644
--- a/src/System/Debug.hpp
+++ b/src/System/Debug.hpp
@@ -60,12 +60,6 @@
# define TRACE(message, ...) sw::trace("%s:%d TRACE: " message "\n", __FILE__, __LINE__, ##__VA_ARGS__)
#endif
-#if defined(SWIFTSHADER_DISABLE_TRACE) || defined(NDEBUG)
-# define LOG_TRAP(message, ...) (void(0))
-#else
-# define LOG_TRAP(message, ...) sw::log_trap("%s:%d %s LOG TRAP: " message "\n", __FILE__, __LINE__, __func__, ##__VA_ARGS__)
-#endif
-
// A macro to print a warning message to the debugging log and stderr to denote
// an issue that needs fixing.
#define FIXME(message, ...) sw::warn("%s:%d FIXME: " message "\n", __FILE__, __LINE__, ##__VA_ARGS__)
diff --git a/src/Vulkan/VkDeviceMemory.cpp b/src/Vulkan/VkDeviceMemory.cpp
index bb0eaa8..0c8058e 100644
--- a/src/Vulkan/VkDeviceMemory.cpp
+++ b/src/Vulkan/VkDeviceMemory.cpp
@@ -234,7 +234,7 @@
break;
#endif // VK_USE_PLATFORM_FUCHSIA
default:
- LOG_TRAP("pAllocateInfo->pNext sType = %s", vk::Stringify(allocationInfo->sType).c_str());
+ UNSUPPORTED("pAllocateInfo->pNext sType = %s", vk::Stringify(allocationInfo->sType).c_str());
break;
}
diff --git a/src/Vulkan/VkFramebuffer.cpp b/src/Vulkan/VkFramebuffer.cpp
index a1b7ec3..8eb821f 100644
--- a/src/Vulkan/VkFramebuffer.cpp
+++ b/src/Vulkan/VkFramebuffer.cpp
@@ -36,8 +36,11 @@
case VK_STRUCTURE_TYPE_FRAMEBUFFER_ATTACHMENTS_CREATE_INFO:
attachmentsCreateInfo = reinterpret_cast<const VkFramebufferAttachmentsCreateInfo *>(curInfo);
break;
+ case VK_STRUCTURE_TYPE_MAX_ENUM:
+ // dEQP tests that this value is ignored.
+ break;
default:
- LOG_TRAP("pFramebufferCreateInfo->pNext->sType = %s", vk::Stringify(curInfo->sType).c_str());
+ UNSUPPORTED("pFramebufferCreateInfo->pNext->sType = %s", vk::Stringify(curInfo->sType).c_str());
break;
}
curInfo = curInfo->pNext;
@@ -239,8 +242,11 @@
case VK_STRUCTURE_TYPE_FRAMEBUFFER_ATTACHMENTS_CREATE_INFO:
attachmentsInfo = reinterpret_cast<const VkFramebufferAttachmentsCreateInfo *>(curInfo);
break;
+ case VK_STRUCTURE_TYPE_MAX_ENUM:
+ // dEQP tests that this value is ignored.
+ break;
default:
- LOG_TRAP("pFramebufferCreateInfo->pNext->sType = %s", vk::Stringify(curInfo->sType).c_str());
+ UNSUPPORTED("pFramebufferCreateInfo->pNext->sType = %s", vk::Stringify(curInfo->sType).c_str());
break;
}
diff --git a/src/Vulkan/VkImage.cpp b/src/Vulkan/VkImage.cpp
index 9dad47b..97dcb99 100644
--- a/src/Vulkan/VkImage.cpp
+++ b/src/Vulkan/VkImage.cpp
@@ -148,8 +148,17 @@
}
break;
#endif
+ // We support these extensions, but they don't affect the image format.
+ case VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO:
+ case VK_STRUCTURE_TYPE_IMAGE_SWAPCHAIN_CREATE_INFO_KHR:
+ case VK_STRUCTURE_TYPE_IMAGE_FORMAT_LIST_CREATE_INFO:
+ case VK_STRUCTURE_TYPE_IMAGE_STENCIL_USAGE_CREATE_INFO:
+ break;
+ case VK_STRUCTURE_TYPE_MAX_ENUM:
+ // dEQP tests that this value is ignored.
+ break;
default:
- LOG_TRAP("pCreateInfo->pNext->sType = %s", vk::Stringify(nextInfo->sType).c_str());
+ UNSUPPORTED("pCreateInfo->pNext->sType = %s", vk::Stringify(nextInfo->sType).c_str());
break;
}
diff --git a/src/Vulkan/VkPhysicalDevice.cpp b/src/Vulkan/VkPhysicalDevice.cpp
index f66c1c9..b47fe0b 100644
--- a/src/Vulkan/VkPhysicalDevice.cpp
+++ b/src/Vulkan/VkPhysicalDevice.cpp
@@ -432,9 +432,18 @@
break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_4444_FORMATS_FEATURES_EXT:
getPhysicalDevice4444FormatsFeaturesExt(reinterpret_cast<struct VkPhysicalDevice4444FormatsFeaturesEXT *>(curExtension));
+ // Unsupported extensions, but used by dEQP
+ // TODO(b/176893525): This may not be legal.
+ case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CONDITIONAL_RENDERING_FEATURES_EXT:
+ case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PERFORMANCE_QUERY_FEATURES_KHR:
+ case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BUFFER_DEVICE_ADDRESS_FEATURES_EXT:
+ case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_FEATURES_EXT:
+ case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_2_FEATURES_EXT:
+ // TODO(b/202964266): Update Vulkan headers
+ case 1000280000: // VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES_KHR
break;
default:
- LOG_TRAP("curExtension->pNext->sType = %s", vk::Stringify(curExtension->sType).c_str());
+ UNSUPPORTED("curExtension->sType: %s", vk::Stringify(curExtension->sType).c_str());
break;
}
curExtension = reinterpret_cast<VkBaseOutStructure *>(curExtension->pNext);
diff --git a/src/Vulkan/VkQueue.cpp b/src/Vulkan/VkQueue.cpp
index 57d2bdb..419658d 100644
--- a/src/Vulkan/VkQueue.cpp
+++ b/src/Vulkan/VkQueue.cpp
@@ -55,8 +55,15 @@
totalSize += tlsSubmitInfo->signalSemaphoreValueCount * sizeof(uint64_t);
}
break;
+ case VK_STRUCTURE_TYPE_DEVICE_GROUP_SUBMIT_INFO:
+ // SwiftShader doesn't use device group submit info because it only supports a single physical device.
+ // However, this extension is core in Vulkan 1.1, so we must treat it as a valid structure type.
+ break;
+ case VK_STRUCTURE_TYPE_MAX_ENUM:
+ // dEQP tests that this value is ignored.
+ break;
default:
- WARN("submitInfo[%d]->pNext sType: %s", i, vk::Stringify(extension->sType).c_str());
+ UNSUPPORTED("submitInfo[%d]->pNext sType: %s", i, vk::Stringify(extension->sType).c_str());
break;
}
}
@@ -120,8 +127,15 @@
submits[i].pNext = tlsSubmitInfoCopy;
}
break;
+ case VK_STRUCTURE_TYPE_DEVICE_GROUP_SUBMIT_INFO:
+ // SwiftShader doesn't use device group submit info because it only supports a single physical device.
+ // However, this extension is core in Vulkan 1.1, so we must treat it as a valid structure type.
+ break;
+ case VK_STRUCTURE_TYPE_MAX_ENUM:
+ // dEQP tests that this value is ignored.
+ break;
default:
- WARN("submitInfo[%d]->pNext sType: %s", i, vk::Stringify(extension->sType).c_str());
+ UNSUPPORTED("submitInfo[%d]->pNext sType: %s", i, vk::Stringify(extension->sType).c_str());
break;
}
}
@@ -189,8 +203,15 @@
case VK_STRUCTURE_TYPE_TIMELINE_SEMAPHORE_SUBMIT_INFO:
timelineInfo = reinterpret_cast<const VkTimelineSemaphoreSubmitInfo *>(submitInfo.pNext);
break;
+ case VK_STRUCTURE_TYPE_MAX_ENUM:
+ // dEQP tests that this value is ignored.
+ break;
+ case VK_STRUCTURE_TYPE_DEVICE_GROUP_SUBMIT_INFO:
+ // SwiftShader doesn't use device group submit info because it only supports a single physical device.
+ // However, this extension is core in Vulkan 1.1, so we must treat it as a valid structure type.
+ break;
default:
- WARN("submitInfo.pNext->sType = %s", vk::Stringify(nextInfo->sType).c_str());
+ UNSUPPORTED("submitInfo.pNext->sType = %s", vk::Stringify(nextInfo->sType).c_str());
break;
}
}
diff --git a/src/Vulkan/VkRenderPass.cpp b/src/Vulkan/VkRenderPass.cpp
index 750c89a..f9deb1f 100644
--- a/src/Vulkan/VkRenderPass.cpp
+++ b/src/Vulkan/VkRenderPass.cpp
@@ -193,8 +193,8 @@
}
break;
default:
- LOG_TRAP("VkRenderPassCreateInfo2KHR->subpass[%d]->pNext sType: %s",
- i, vk::Stringify(extension->sType).c_str());
+ UNSUPPORTED("VkRenderPassCreateInfo2KHR->subpass[%d]->pNext sType: %s",
+ i, vk::Stringify(extension->sType).c_str());
break;
}
@@ -259,8 +259,14 @@
}
}
break;
+ case VK_STRUCTURE_TYPE_RENDER_PASS_INPUT_ATTACHMENT_ASPECT_CREATE_INFO:
+ // VkRenderPassInputAttachmentAspectCreateInfo has already been handled in libvulkan.
+ break;
+ case VK_STRUCTURE_TYPE_MAX_ENUM:
+ // dEQP tests that this value is ignored.
+ break;
default:
- WARN("pCreateInfo->pNext sType = %s", vk::Stringify(extensionCreateInfo->sType).c_str());
+ UNSUPPORTED("pCreateInfo->pNext sType = %s", vk::Stringify(extensionCreateInfo->sType).c_str());
break;
}
@@ -404,8 +410,8 @@
}
break;
default:
- LOG_TRAP("VkRenderPassCreateInfo2KHR->subpass[%d]->pNext sType: %s",
- i, vk::Stringify(extension->sType).c_str());
+ UNSUPPORTED("VkRenderPassCreateInfo2KHR->subpass[%d]->pNext sType: %s",
+ i, vk::Stringify(extension->sType).c_str());
break;
}
diff --git a/src/Vulkan/libVulkan.cpp b/src/Vulkan/libVulkan.cpp
index cfd7191..c160dab 100644
--- a/src/Vulkan/libVulkan.cpp
+++ b/src/Vulkan/libVulkan.cpp
@@ -245,8 +245,11 @@
ASSERT(vk::Cast(device)->getPhysicalDevice()->getProperties().limits.maxFramebufferLayers >= 32);
}
break;
+ case VK_STRUCTURE_TYPE_MAX_ENUM:
+ // dEQP tests that this value is ignored.
+ break;
default:
- LOG_TRAP("pCreateInfo->pNext sType = %s", vk::Stringify(extensionCreateInfo->sType).c_str());
+ UNSUPPORTED("pCreateInfo->pNext sType = %s", vk::Stringify(extensionCreateInfo->sType).c_str());
break;
}
@@ -539,7 +542,7 @@
// Vulkan structures in this Specification."
break;
default:
- LOG_TRAP("pCreateInfo->pNext sType = %s", vk::Stringify(createInfo->sType).c_str());
+ UNSUPPORTED("pCreateInfo->pNext sType = %s", vk::Stringify(createInfo->sType).c_str());
break;
}
}
@@ -903,9 +906,14 @@
}
}
break;
+ // These structs are supported, but no behavior changes based on their feature bools
+ case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_UNIFORM_BUFFER_STANDARD_LAYOUT_FEATURES:
+ case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_EXTENDED_TYPES_FEATURES:
+ case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_4444_FORMATS_FEATURES_EXT:
+ break;
default:
// "the [driver] must skip over, without processing (other than reading the sType and pNext members) any structures in the chain with sType values not defined by [supported extenions]"
- LOG_TRAP("pCreateInfo->pNext sType = %s", vk::Stringify(extensionCreateInfo->sType).c_str());
+ UNSUPPORTED("pCreateInfo->pNext sType = %s", vk::Stringify(extensionCreateInfo->sType).c_str());
break;
}
@@ -935,7 +943,7 @@
auto extInfo = reinterpret_cast<VkBaseInStructure const *>(queueCreateInfo.pNext);
while(extInfo)
{
- LOG_TRAP("pCreateInfo->pQueueCreateInfos[%d].pNext sType = %s", i, vk::Stringify(extInfo->sType).c_str());
+ UNSUPPORTED("pCreateInfo->pQueueCreateInfos[%d].pNext sType = %s", i, vk::Stringify(extInfo->sType).c_str());
extInfo = extInfo->pNext;
}
@@ -1321,7 +1329,15 @@
auto *nextInfo = reinterpret_cast<const VkBaseInStructure *>(pCreateInfo->pNext);
while(nextInfo)
{
- LOG_TRAP("pCreateInfo->pNext sType = %s", vk::Stringify(nextInfo->sType).c_str());
+ switch(nextInfo->sType)
+ {
+ case VK_STRUCTURE_TYPE_MAX_ENUM:
+ // dEQP tests that this value is ignored.
+ break;
+ default:
+ UNSUPPORTED("pCreateInfo->pNext sType = %s", vk::Stringify(nextInfo->sType).c_str());
+ break;
+ }
nextInfo = nextInfo->pNext;
}
@@ -1522,7 +1538,7 @@
while(extInfo)
{
// Vulkan 1.2: "pNext must be NULL"
- LOG_TRAP("pCreateInfo->pNext sType = %s", vk::Stringify(extInfo->sType).c_str());
+ UNSUPPORTED("pCreateInfo->pNext sType = %s", vk::Stringify(extInfo->sType).c_str());
extInfo = extInfo->pNext;
}
@@ -1576,7 +1592,7 @@
auto extInfo = reinterpret_cast<VkBaseInStructure const *>(pCreateInfo->pNext);
while(extInfo)
{
- LOG_TRAP("pCreateInfo->pNext sType = %s", vk::Stringify(extInfo->sType).c_str());
+ UNSUPPORTED("pCreateInfo->pNext sType = %s", vk::Stringify(extInfo->sType).c_str());
extInfo = extInfo->pNext;
}
@@ -1612,8 +1628,11 @@
case VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_BUFFER_CREATE_INFO:
// Do nothing. Should be handled by vk::Buffer::Create().
break;
+ case VK_STRUCTURE_TYPE_MAX_ENUM:
+ // dEQP tests that this value is ignored.
+ break;
default:
- LOG_TRAP("pCreateInfo->pNext sType = %s", vk::Stringify(nextInfo->sType).c_str());
+ UNSUPPORTED("pCreateInfo->pNext sType = %s", vk::Stringify(nextInfo->sType).c_str());
break;
}
nextInfo = nextInfo->pNext;
@@ -1668,7 +1687,7 @@
auto extInfo = reinterpret_cast<VkBaseInStructure const *>(pCreateInfo->pNext);
while(extInfo)
{
- LOG_TRAP("pCreateInfo->pNext sType = %s", vk::Stringify(extInfo->sType).c_str());
+ UNSUPPORTED("pCreateInfo->pNext sType = %s", vk::Stringify(extInfo->sType).c_str());
extInfo = extInfo->pNext;
}
@@ -1736,9 +1755,12 @@
(void)stencilUsageInfo->stencilUsage;
}
break;
+ case VK_STRUCTURE_TYPE_MAX_ENUM:
+ // dEQP tests that this value is ignored.
+ break;
default:
// "the [driver] must skip over, without processing (other than reading the sType and pNext members) any structures in the chain with sType values not defined by [supported extenions]"
- LOG_TRAP("pCreateInfo->pNext sType = %s", vk::Stringify(extensionCreateInfo->sType).c_str());
+ UNSUPPORTED("pCreateInfo->pNext sType = %s", vk::Stringify(extensionCreateInfo->sType).c_str());
break;
}
@@ -1841,8 +1863,11 @@
}
}
break;
+ case VK_STRUCTURE_TYPE_MAX_ENUM:
+ // dEQP tests that this value is ignored.
+ break;
default:
- LOG_TRAP("pCreateInfo->pNext sType = %s", vk::Stringify(extensionCreateInfo->sType).c_str());
+ UNSUPPORTED("pCreateInfo->pNext sType = %s", vk::Stringify(extensionCreateInfo->sType).c_str());
break;
}
@@ -1881,7 +1906,15 @@
auto *nextInfo = reinterpret_cast<const VkBaseInStructure *>(pCreateInfo->pNext);
while(nextInfo)
{
- LOG_TRAP("pCreateInfo->pNext sType = %s", vk::Stringify(nextInfo->sType).c_str());
+ switch(nextInfo->sType)
+ {
+ case VK_STRUCTURE_TYPE_MAX_ENUM:
+ // dEQP tests that this value is ignored.
+ break;
+ default:
+ UNSUPPORTED("pCreateInfo->pNext sType = %s", vk::Stringify(nextInfo->sType).c_str());
+ break;
+ }
nextInfo = nextInfo->pNext;
}
@@ -1910,7 +1943,7 @@
auto extInfo = reinterpret_cast<VkBaseInStructure const *>(pCreateInfo->pNext);
while(extInfo)
{
- LOG_TRAP("pCreateInfo->pNext sType = %s", vk::Stringify(extInfo->sType).c_str());
+ UNSUPPORTED("pCreateInfo->pNext sType = %s", vk::Stringify(extInfo->sType).c_str());
extInfo = extInfo->pNext;
}
@@ -2027,7 +2060,15 @@
auto *nextInfo = reinterpret_cast<const VkBaseInStructure *>(pCreateInfo->pNext);
while(nextInfo)
{
- LOG_TRAP("pCreateInfo->pNext sType = %s", vk::Stringify(nextInfo->sType).c_str());
+ switch(nextInfo->sType)
+ {
+ case VK_STRUCTURE_TYPE_MAX_ENUM:
+ // dEQP tests that this value is ignored.
+ break;
+ default:
+ UNSUPPORTED("pCreateInfo->pNext sType = %s", vk::Stringify(nextInfo->sType).c_str());
+ break;
+ }
nextInfo = nextInfo->pNext;
}
@@ -2086,7 +2127,7 @@
}
break;
default:
- LOG_TRAP("pCreateInfo->pNext sType = %s", vk::Stringify(extensionCreateInfo->sType).c_str());
+ UNSUPPORTED("pCreateInfo->pNext sType = %s", vk::Stringify(extensionCreateInfo->sType).c_str());
break;
}
@@ -2135,7 +2176,7 @@
ASSERT(!vk::Cast(device)->hasExtension(VK_EXT_DESCRIPTOR_INDEXING_EXTENSION_NAME));
break;
default:
- LOG_TRAP("pCreateInfo->pNext sType = %s", vk::Stringify(extensionCreateInfo->sType).c_str());
+ UNSUPPORTED("pCreateInfo->pNext sType = %s", vk::Stringify(extensionCreateInfo->sType).c_str());
break;
}
@@ -2161,7 +2202,7 @@
auto extInfo = reinterpret_cast<VkBaseInStructure const *>(pCreateInfo->pNext);
while(extInfo)
{
- LOG_TRAP("pCreateInfo->pNext sType = %s", vk::Stringify(extInfo->sType).c_str());
+ UNSUPPORTED("pCreateInfo->pNext sType = %s", vk::Stringify(extInfo->sType).c_str());
extInfo = extInfo->pNext;
}
@@ -2198,7 +2239,7 @@
auto extInfo = reinterpret_cast<VkBaseInStructure const *>(pAllocateInfo->pNext);
while(extInfo)
{
- LOG_TRAP("pAllocateInfo->pNext sType = %s", vk::Stringify(extInfo->sType).c_str());
+ UNSUPPORTED("pAllocateInfo->pNext sType = %s", vk::Stringify(extInfo->sType).c_str());
extInfo = extInfo->pNext;
}
@@ -2295,7 +2336,15 @@
auto *nextInfo = reinterpret_cast<const VkBaseInStructure *>(pCreateInfo->pNext);
while(nextInfo)
{
- LOG_TRAP("pCreateInfo->pNext sType = %s", vk::Stringify(nextInfo->sType).c_str());
+ switch(nextInfo->sType)
+ {
+ case VK_STRUCTURE_TYPE_MAX_ENUM:
+ // dEQP tests that this value is ignored.
+ break;
+ default:
+ UNSUPPORTED("pCreateInfo->pNext sType = %s", vk::Stringify(nextInfo->sType).c_str());
+ break;
+ }
nextInfo = nextInfo->pNext;
}
@@ -2326,7 +2375,15 @@
auto *nextInfo = reinterpret_cast<const VkBaseInStructure *>(pAllocateInfo->pNext);
while(nextInfo)
{
- LOG_TRAP("pAllocateInfo->pNext sType = %s", vk::Stringify(nextInfo->sType).c_str());
+ switch(nextInfo->sType)
+ {
+ case VK_STRUCTURE_TYPE_MAX_ENUM:
+ // dEQP tests that this value is ignored.
+ break;
+ default:
+ UNSUPPORTED("pAllocateInfo->pNext sType = %s", vk::Stringify(nextInfo->sType).c_str());
+ break;
+ }
nextInfo = nextInfo->pNext;
}
@@ -2349,7 +2406,15 @@
auto *nextInfo = reinterpret_cast<const VkBaseInStructure *>(pBeginInfo->pNext);
while(nextInfo)
{
- LOG_TRAP("pBeginInfo->pNext sType = %s", vk::Stringify(nextInfo->sType).c_str());
+ switch(nextInfo->sType)
+ {
+ case VK_STRUCTURE_TYPE_MAX_ENUM:
+ // dEQP tests that this value is ignored.
+ break;
+ default:
+ UNSUPPORTED("pBeginInfo->pNext sType = %s", vk::Stringify(nextInfo->sType).c_str());
+ break;
+ }
nextInfo = nextInfo->pNext;
}
@@ -2730,8 +2795,11 @@
case VK_STRUCTURE_TYPE_RENDER_PASS_ATTACHMENT_BEGIN_INFO:
attachmentBeginInfo = reinterpret_cast<const VkRenderPassAttachmentBeginInfo *>(renderPassBeginInfo);
break;
+ case VK_STRUCTURE_TYPE_MAX_ENUM:
+ // dEQP tests that this value is ignored.
+ break;
default:
- LOG_TRAP("pRenderPassBegin->pNext sType = %s", vk::Stringify(renderPassBeginInfo->sType).c_str());
+ UNSUPPORTED("pRenderPassBegin->pNext sType = %s", vk::Stringify(renderPassBeginInfo->sType).c_str());
break;
}
@@ -2796,7 +2864,7 @@
auto extInfo = reinterpret_cast<VkBaseInStructure const *>(pBindInfos[i].pNext);
while(extInfo)
{
- LOG_TRAP("pBindInfos[%d].pNext sType = %s", i, vk::Stringify(extInfo->sType).c_str());
+ UNSUPPORTED("pBindInfos[%d].pNext sType = %s", i, vk::Stringify(extInfo->sType).c_str());
extInfo = extInfo->pNext;
}
@@ -2854,7 +2922,7 @@
#endif
default:
- LOG_TRAP("pBindInfos[%d].pNext sType = %s", i, vk::Stringify(extInfo->sType).c_str());
+ UNSUPPORTED("pBindInfos[%d].pNext sType = %s", i, vk::Stringify(extInfo->sType).c_str());
break;
}
extInfo = extInfo->pNext;
@@ -2913,7 +2981,7 @@
auto extInfo = reinterpret_cast<VkBaseInStructure const *>(pInfo->pNext);
while(extInfo)
{
- LOG_TRAP("pInfo->pNext sType = %s", vk::Stringify(extInfo->sType).c_str());
+ UNSUPPORTED("pInfo->pNext sType = %s", vk::Stringify(extInfo->sType).c_str());
extInfo = extInfo->pNext;
}
@@ -2936,7 +3004,7 @@
}
break;
default:
- LOG_TRAP("pMemoryRequirements->pNext sType = %s", vk::Stringify(extensionRequirements->sType).c_str());
+ UNSUPPORTED("pMemoryRequirements->pNext sType = %s", vk::Stringify(extensionRequirements->sType).c_str());
break;
}
@@ -2954,7 +3022,7 @@
auto extInfo = reinterpret_cast<VkBaseInStructure const *>(pInfo->pNext);
while(extInfo)
{
- LOG_TRAP("pInfo->pNext sType = %s", vk::Stringify(extInfo->sType).c_str());
+ UNSUPPORTED("pInfo->pNext sType = %s", vk::Stringify(extInfo->sType).c_str());
extInfo = extInfo->pNext;
}
@@ -2970,7 +3038,7 @@
}
break;
default:
- LOG_TRAP("pMemoryRequirements->pNext sType = %s", vk::Stringify(extensionRequirements->sType).c_str());
+ UNSUPPORTED("pMemoryRequirements->pNext sType = %s", vk::Stringify(extensionRequirements->sType).c_str());
break;
}
@@ -2988,14 +3056,14 @@
auto extInfo = reinterpret_cast<VkBaseInStructure const *>(pInfo->pNext);
while(extInfo)
{
- LOG_TRAP("pInfo->pNext sType = %s", vk::Stringify(extInfo->sType).c_str());
+ UNSUPPORTED("pInfo->pNext sType = %s", vk::Stringify(extInfo->sType).c_str());
extInfo = extInfo->pNext;
}
auto extensionRequirements = reinterpret_cast<VkBaseInStructure const *>(pSparseMemoryRequirements->pNext);
while(extensionRequirements)
{
- LOG_TRAP("pSparseMemoryRequirements->pNext sType = %s", vk::Stringify(extensionRequirements->sType).c_str());
+ UNSUPPORTED("pSparseMemoryRequirements->pNext sType = %s", vk::Stringify(extensionRequirements->sType).c_str());
extensionRequirements = extensionRequirements->pNext;
}
@@ -3146,7 +3214,7 @@
break;
default:
// "the [driver] must skip over, without processing (other than reading the sType and pNext members) any structures in the chain with sType values not defined by [supported extenions]"
- LOG_TRAP("pProperties->pNext sType = %s", vk::Stringify(extensionProperties->sType).c_str());
+ UNSUPPORTED("pProperties->pNext sType = %s", vk::Stringify(extensionProperties->sType).c_str());
break;
}
@@ -3164,7 +3232,7 @@
auto extInfo = reinterpret_cast<VkBaseInStructure const *>(pFormatProperties->pNext);
while(extInfo)
{
- LOG_TRAP("pFormatProperties->pNext sType = %s", vk::Stringify(extInfo->sType).c_str());
+ UNSUPPORTED("pFormatProperties->pNext sType = %s", vk::Stringify(extInfo->sType).c_str());
extInfo = extInfo->pNext;
}
@@ -3260,7 +3328,7 @@
}
break;
default:
- LOG_TRAP("pImageFormatInfo->pNext sType = %s", vk::Stringify(extensionFormatInfo->sType).c_str());
+ UNSUPPORTED("pImageFormatInfo->pNext sType = %s", vk::Stringify(extensionFormatInfo->sType).c_str());
break;
}
@@ -3305,7 +3373,7 @@
break;
#endif
default:
- LOG_TRAP("pImageFormatProperties->pNext sType = %s", vk::Stringify(extensionProperties->sType).c_str());
+ UNSUPPORTED("pImageFormatProperties->pNext sType = %s", vk::Stringify(extensionProperties->sType).c_str());
break;
}
@@ -3432,7 +3500,7 @@
auto extInfo = reinterpret_cast<VkBaseInStructure const *>(pQueueFamilyProperties->pNext);
while(extInfo)
{
- LOG_TRAP("pQueueFamilyProperties->pNext sType = %s", vk::Stringify(extInfo->sType).c_str());
+ UNSUPPORTED("pQueueFamilyProperties->pNext sType = %s", vk::Stringify(extInfo->sType).c_str());
extInfo = extInfo->pNext;
}
}
@@ -3454,7 +3522,7 @@
auto extInfo = reinterpret_cast<VkBaseInStructure const *>(pMemoryProperties->pNext);
while(extInfo)
{
- LOG_TRAP("pMemoryProperties->pNext sType = %s", vk::Stringify(extInfo->sType).c_str());
+ UNSUPPORTED("pMemoryProperties->pNext sType = %s", vk::Stringify(extInfo->sType).c_str());
extInfo = extInfo->pNext;
}
@@ -3471,7 +3539,7 @@
auto extInfo = reinterpret_cast<VkBaseInStructure const *>(pProperties->pNext);
while(extInfo)
{
- LOG_TRAP("pProperties->pNext sType = %s", vk::Stringify(extInfo->sType).c_str());
+ UNSUPPORTED("pProperties->pNext sType = %s", vk::Stringify(extInfo->sType).c_str());
extInfo = extInfo->pNext;
}
}
@@ -3502,7 +3570,7 @@
auto extInfo = reinterpret_cast<VkBaseInStructure const *>(pQueueInfo->pNext);
while(extInfo)
{
- LOG_TRAP("pQueueInfo->pNext sType = %s", vk::Stringify(extInfo->sType).c_str());
+ UNSUPPORTED("pQueueInfo->pNext sType = %s", vk::Stringify(extInfo->sType).c_str());
extInfo = extInfo->pNext;
}
@@ -3527,7 +3595,7 @@
auto extInfo = reinterpret_cast<VkBaseInStructure const *>(pCreateInfo->pNext);
while(extInfo)
{
- LOG_TRAP("pCreateInfo->pNext sType = %s", vk::Stringify(extInfo->sType).c_str());
+ UNSUPPORTED("pCreateInfo->pNext sType = %s", vk::Stringify(extInfo->sType).c_str());
extInfo = extInfo->pNext;
}
@@ -3561,7 +3629,7 @@
auto extInfo = reinterpret_cast<VkBaseInStructure const *>(pCreateInfo->pNext);
while(extInfo)
{
- LOG_TRAP("pCreateInfo->pNext sType = %s", vk::Stringify(extInfo->sType).c_str());
+ UNSUPPORTED("pCreateInfo->pNext sType = %s", vk::Stringify(extInfo->sType).c_str());
extInfo = extInfo->pNext;
}
