[vk] Conditioning Conditional Rendering #2

src/video_core/renderer_vulkan/vk_query_cache.cpp

@@ -1200,6 +1200,7 @@ struct QueryCacheRuntimeImpl {
         hcr_setup.pNext = nullptr;
         hcr_setup.flags = 0;
 
+        if (device.IsExtConditionalRendering()) {
             conditional_resolve_pass = std::make_unique<ConditionalRenderingResolvePass>(
                 device, scheduler, descriptor_pool, compute_pass_descriptor_queue);
 
@@ -1214,7 +1215,9 @@ struct QueryCacheRuntimeImpl {
                 .queueFamilyIndexCount = 0,
                 .pQueueFamilyIndices = nullptr,
             };
-        hcr_resolve_buffer = memory_allocator.CreateBuffer(buffer_ci, MemoryUsage::DeviceLocal);
+            hcr_resolve_buffer =
+                memory_allocator.CreateBuffer(buffer_ci, MemoryUsage::DeviceLocal);
+        }
     }
 
     VideoCore::RasterizerInterface* rasterizer;

src/video_core/vulkan_common/vulkan_device.cpp

@@ -377,10 +377,10 @@ void Device::RemoveExtension(bool& extension, const std::string& extension_name)
     loaded_extensions.erase(extension_name);
 }
 
-void Device::RemoveExtensionIfUnsuitable(bool is_suitable, const std::string& extension_name) {
-    if (loaded_extensions.contains(extension_name) && !is_suitable) {
+void Device::RemoveExtensionIfUnsuitable(bool& extension, const std::string& extension_name) {
+    if (loaded_extensions.contains(extension_name) && !extension) {
         LOG_WARNING(Render_Vulkan, "Removing unsuitable extension {}", extension_name);
-        this->RemoveExtension(is_suitable, extension_name);
+        this->RemoveExtension(extension, extension_name);
     }
 }
 
@@ -401,11 +401,12 @@ void Device::RemoveExtensionFeature(bool& extension, Feature& feature,
 }
 
 template <typename Feature>
-void Device::RemoveExtensionFeatureIfUnsuitable(bool is_suitable, Feature& feature,
+void Device::RemoveExtensionFeatureIfUnsuitable(bool& extension, Feature& feature,
                                                 const std::string& extension_name) {
-    if (loaded_extensions.contains(extension_name) && !is_suitable) {
-        LOG_WARNING(Render_Vulkan, "Removing features for unsuitable extension {}", extension_name);
-        this->RemoveExtensionFeature(is_suitable, feature, extension_name);
+    if (loaded_extensions.contains(extension_name) && !extension) {
+        LOG_WARNING(Render_Vulkan,
+                    "Removing features for unsuitable extension {}", extension_name);
+        this->RemoveExtensionFeature(extension, feature, extension_name);
     }
 }
 

src/video_core/vulkan_common/vulkan_device.h

@@ -963,13 +963,13 @@ private:
     void RemoveUnsuitableExtensions();
 
     void RemoveExtension(bool& extension, const std::string& extension_name);
-    void RemoveExtensionIfUnsuitable(bool is_suitable, const std::string& extension_name);
+    void RemoveExtensionIfUnsuitable(bool& extension, const std::string& extension_name);
 
     template <typename Feature>
     void RemoveExtensionFeature(bool& extension, Feature& feature,
                                 const std::string& extension_name);
     template <typename Feature>
-    void RemoveExtensionFeatureIfUnsuitable(bool is_suitable, Feature& feature,
+    void RemoveExtensionFeatureIfUnsuitable(bool& extension, Feature& feature,
                                             const std::string& extension_name);
 
     /// Sets up queue families.