commit bf350ae6042a3a50cd080241168ad26fa4cd5531
author Nicolas Capens <nicolascapens@google.com> Tue Aug 30 18:57:10 2022 +0000
committer Nicolas Capens <nicolascapens@google.com> Wed Aug 31 04:46:07 2022 +0000
tree 596aee8377405619f0e00257217a052d64b1666d
parent 3485c581d1b05e0a98f05e4001f770facb2955f8

Revert "Temporarily allow unsupported structures in PhysicalDevice::getFeatures2()"

This reverts commit ed9d5ae1e79c3ecc3bee8e07e852ba24868d27d5.

Reason for revert: Fixed in dEQP: https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/3879

Bug: b/216982034
Change-Id: I948ea06bb5dd7c42875eb18608ff6fda19cb7bfd
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/67849
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Kokoro-Result: kokoro <noreply+kokoro@google.com>

src/Vulkan/VkPhysicalDevice.cpp

diff --git a/src/Vulkan/VkPhysicalDevice.cpp b/src/Vulkan/VkPhysicalDevice.cpp
index 4d8f98c..0f8d200 100644
--- a/src/Vulkan/VkPhysicalDevice.cpp
+++ b/src/Vulkan/VkPhysicalDevice.cpp
@@ -614,8 +614,7 @@
 		case VK_STRUCTURE_TYPE_MAX_ENUM:  // TODO(b/176893525): This may not be legal. dEQP tests that this value is ignored.
 			break;
 		default:
-			// TODO(b/216982034): Revert to UNSUPPORTED() when https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/3879 is fixed.
-			WARN("curExtension->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);