Vulkan: Cleanup device feature query and enabling

All device extension features and properties queries are now performed in a single call for each (i.e. one for features, one for properties), with all the extension structs chained. Then based on which feature is present (not just whether the extension is supported), the extensions and features are enabled. In the process, it fixes the following issues: - If VK_EXT_vertex_attribute_divisor is present, but the necessary vertexAttributeInstanceRateDivisor feature is not supported, that feature is not enabled and the emulation path is taken. Incidentally, this also fixes an issue with renderdoc that refuses to replay captures on such devices. - If VK_EXT_transform_feedback is present, but the necessary transformFeedback feature is not supported, similarly that feature is not enabled and the emulation path is taken. Bug: angleproject:4306 Bug: angleproject:4027 Change-Id: I0969064cba811d215c37dfe551b0ceedb334051c Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2005111 Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: Tobin Ehlis <tobine@google.com>

Vulkan: Cleanup device feature query and enabling
13205b93 · Shahbaz Youssefi · Commit Bot · 3b2780e6 · 13205b93 · 13205b93
Commit 13205b93 authored Jan 16, 2020 by Shahbaz Youssefi Committed by Commit Bot Jan 21, 2020
Showing with 12 additions and 8 deletions

RendererVk.cpp src/libANGLE/renderer/vulkan/RendererVk.cpp +0 -0

RendererVk.h src/libANGLE/renderer/vulkan/RendererVk.h +6 -1

vk_utils.h src/libANGLE/renderer/vulkan/vk_utils.h +6 -7

No files found.
--- a/src/libANGLE/renderer/vulkan/RendererVk.cpp
+++ b/src/libANGLE/renderer/vulkan/RendererVk.cpp
--- a/src/libANGLE/renderer/vulkan/RendererVk.h
+++ b/src/libANGLE/renderer/vulkan/RendererVk.h
@@ -220,6 +220,8 @@ class RendererVk : angle::NonCopyable
    angle::Result initializeDevice(DisplayVk *displayVk, uint32_t queueFamilyIndex);
    void ensureCapsInitialized() const;

+    void queryDeviceExtensionFeatures(const ExtensionNameList &deviceExtensionNames);
+
    void initFeatures(const ExtensionNameList &extensions);
    void initPipelineCacheVkKey();
    angle::Result initPipelineCache(DisplayVk *display,
@@ -252,10 +254,13 @@ class RendererVk : angle::NonCopyable
    VkDebugReportCallbackEXT mDebugReportCallback;
    VkPhysicalDevice mPhysicalDevice;
    VkPhysicalDeviceProperties mPhysicalDeviceProperties;
-    VkPhysicalDeviceSubgroupProperties mPhysicalDeviceSubgroupProperties;
    VkPhysicalDeviceFeatures mPhysicalDeviceFeatures;
    VkPhysicalDeviceLineRasterizationFeaturesEXT mLineRasterizationFeatures;
    VkPhysicalDeviceProvokingVertexFeaturesEXT mProvokingVertexFeatures;
+    VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT mVertexAttributeDivisorFeatures;
+    VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT mVertexAttributeDivisorProperties;
+    VkPhysicalDeviceTransformFeedbackFeaturesEXT mTransformFeedbackFeatures;
+    VkPhysicalDeviceSubgroupProperties mPhysicalDeviceSubgroupProperties;
    std::vector<VkQueueFamilyProperties> mQueueFamilyProperties;
    std::mutex mQueueMutex;
    VkQueue mQueue;

--- a/src/libANGLE/renderer/vulkan/vk_utils.h
+++ b/src/libANGLE/renderer/vulkan/vk_utils.h
@@ -103,16 +103,15 @@ namespace vk
 {
 struct Format;

-// Append ptr to end of pNext chain beginning at chainStart
+// Prepend ptr to the pNext chain at chainStart
 template <typename VulkanStruct1, typename VulkanStruct2>
-void AppendToPNextChain(VulkanStruct1 *chainStart, VulkanStruct2 *ptr)
+void AddToPNextChain(VulkanStruct1 *chainStart, VulkanStruct2 *ptr)
 {
+    ASSERT(ptr->pNext == nullptr);
+
    VkBaseOutStructure *localPtr = reinterpret_cast<VkBaseOutStructure *>(chainStart);
-    while (localPtr->pNext)
-    {
-        localPtr = localPtr->pNext;
-    }
-    localPtr->pNext = reinterpret_cast<VkBaseOutStructure *>(ptr);
+    ptr->pNext                   = localPtr->pNext;
+    localPtr->pNext              = reinterpret_cast<VkBaseOutStructure *>(ptr);
 }

 extern const char *gLoaderLayersPathEnv;