Vulkan: remove dependency to inheritedQueries

src/libANGLE/renderer/vulkan/CommandGraph.cpp

@@ -320,7 +320,7 @@ angle::Result CommandGraphNode::beginOutsideRenderPassRecording(Context *context
     inheritanceInfo.subpass     = 0;
     inheritanceInfo.framebuffer = VK_NULL_HANDLE;
     inheritanceInfo.occlusionQueryEnable =
-        context->getRenderer()->getPhysicalDeviceFeatures().inheritedQueries;
+        CommandBuffer::SupportsQueries(context->getRenderer()->getPhysicalDeviceFeatures());
     inheritanceInfo.queryFlags         = 0;
     inheritanceInfo.pipelineStatistics = 0;
 
@@ -348,7 +348,7 @@ angle::Result CommandGraphNode::beginInsideRenderPassRecording(Context *context,
     inheritanceInfo.subpass     = 0;
     inheritanceInfo.framebuffer = mRenderPassFramebuffer.getHandle();
     inheritanceInfo.occlusionQueryEnable =
-        context->getRenderer()->getPhysicalDeviceFeatures().inheritedQueries;
+        CommandBuffer::SupportsQueries(context->getRenderer()->getPhysicalDeviceFeatures());
     inheritanceInfo.queryFlags         = 0;
     inheritanceInfo.pipelineStatistics = 0;
 

src/libANGLE/renderer/vulkan/RendererVk.cpp

@@ -1141,8 +1141,8 @@ gl::Version RendererVk::getMaxSupportedESVersion() const
     maxVersion = gl::Version(2, 0);
 #endif
 
-    // Vulkan inherited queries are required to support any GL query type
-    if (!mPhysicalDeviceFeatures.inheritedQueries)
+    // If the command buffer doesn't support queries, we can't support ES3.
+    if (!vk::CommandBuffer::SupportsQueries(mPhysicalDeviceFeatures))
     {
         maxVersion = std::max(maxVersion, gl::Version(2, 0));
     }

src/libANGLE/renderer/vulkan/SecondaryCommandBuffer.h

@@ -328,6 +328,8 @@ class SecondaryCommandBuffer final : angle::NonCopyable
     SecondaryCommandBuffer();
     ~SecondaryCommandBuffer();
 
+    static bool SupportsQueries(const VkPhysicalDeviceFeatures &features) { return true; }
+
     // Add commands
     void beginQuery(VkQueryPool queryPool, uint32_t query, VkQueryControlFlags flags);
 

src/libANGLE/renderer/vulkan/vk_caps_utils.cpp

@@ -68,7 +68,8 @@ void RendererVk::ensureCapsInitialized() const
     // We use secondary command buffers almost everywhere and they require a feature to be
     // able to execute in the presence of queries.  As a result, we won't support queries
     // unless that feature is available.
-    mNativeExtensions.occlusionQueryBoolean = mPhysicalDeviceFeatures.inheritedQueries;
+    mNativeExtensions.occlusionQueryBoolean =
+        vk::CommandBuffer::SupportsQueries(mPhysicalDeviceFeatures);
 
     // From the Vulkan specs:
     // > The number of valid bits in a timestamp value is determined by the

src/libANGLE/renderer/vulkan/vk_wrapper.h

@@ -172,6 +172,11 @@ class CommandBuffer : public WrappedObject<CommandBuffer, VkCommandBuffer>
 
     using WrappedObject::operator=;
 
+    static bool SupportsQueries(const VkPhysicalDeviceFeatures &features)
+    {
+        return features.inheritedQueries;
+    }
+
     VkResult begin(const VkCommandBufferBeginInfo &info);
 
     void beginQuery(VkQueryPool queryPool, uint32_t query, VkQueryControlFlags flags);