Remove isEmulatingExtFrameBoundary

Author: solidpixel

layer_gpu_timeline/source/device.hpp

@@ -185,14 +185,6 @@ class Device
      */
     static const std::vector<DeviceCreatePatchPtr> createInfoPatches;
 
-    /**
-     * @brief Is this layer emulating VK_EXT_frame_boundary?
-     *
-     * Set to @c true if layer is emulating on top of a driver that doesn't
-     * support it, @c false if layer knows driver supports it.
-     */
-    bool isEmulatingExtFrameBoundary { false };
-
 private:
     /**
      * @brief State tracker for this device.

layer_gpu_timeline/source/layer_device_functions_queue.cpp

@@ -107,7 +107,7 @@ static void emitCommandBufferMetadata(Device& layer,
  * @param workloadVisitor   Visitor for the protobuf encoder.
  */
 static void checkManualFrameBoundary(
-    Device* layer,
+    Device& layer,
     VkQueue queue,
     const void* pNext,
     bool isLastSubmit,
@@ -118,10 +118,10 @@ static void checkManualFrameBoundary(
     if (ext && (ext->flags & VK_FRAME_BOUNDARY_FRAME_END_BIT_EXT))
     {
         // Emulate a queue present to indicate end of frame
-        auto& tracker = layer->getStateTracker();
+        auto& tracker = layer.getStateTracker();
         tracker.queuePresent();
 
-        TimelineProtobufEncoder::emitFrame(*layer, tracker.totalStats.getFrameCount(), getClockMonotonicRaw());
+        TimelineProtobufEncoder::emitFrame(layer, tracker.totalStats.getFrameCount(), getClockMonotonicRaw());
 
         // Emulate a new queue submit if work remains to submit
         if (!isLastSubmit)
@@ -148,12 +148,6 @@ VKAPI_ATTR VkResult VKAPI_CALL layer_vkQueuePresentKHR<user_tag>(VkQueue queue,
     vku::safe_VkPresentInfoKHR safePresentInfo(pPresentInfo);
     auto* newPresentInfo = reinterpret_cast<VkPresentInfoKHR*>(&safePresentInfo);
 
-    // Remove emulated frame boundaries
-    if (layer->isEmulatingExtFrameBoundary)
-    {
-        vku::RemoveFromPnext(safePresentInfo, VK_STRUCTURE_TYPE_FRAME_BOUNDARY_EXT);
-    }
-
     // Note that we assume QueuePresent is _always_ the end of a frame.
     // This is run with the lock held to ensure that all queue submit messages
     // are sent sequentially to the host tool
@@ -194,7 +188,7 @@ VKAPI_ATTR VkResult VKAPI_CALL
 
         // Check for end of frame boundary
         bool isLast = i == submitCount - 1;
-        checkManualFrameBoundary(layer, queue, submit.pNext, isLast, workloadVisitor);
+        checkManualFrameBoundary(*layer, queue, submit.pNext, isLast, workloadVisitor);
     }
 
     // Release the lock to call into the driver
@@ -232,7 +226,7 @@ VKAPI_ATTR VkResult VKAPI_CALL
 
         // Check for end of frame boundary
         bool isLast = i == submitCount - 1;
-        checkManualFrameBoundary(layer, queue, submit.pNext, isLast, workloadVisitor);
+        checkManualFrameBoundary(*layer, queue, submit.pNext, isLast, workloadVisitor);
     }
 
     // Release the lock to call into the driver
@@ -270,7 +264,7 @@ VKAPI_ATTR VkResult VKAPI_CALL
 
         // Check for end of frame boundary
         bool isLast = i == submitCount - 1;
-        checkManualFrameBoundary(layer, queue, submit.pNext, isLast, workloadVisitor);
+        checkManualFrameBoundary(*layer, queue, submit.pNext, isLast, workloadVisitor);
     }
 
     // Release the lock to call into the driver

layer_gpu_timeline/source/layer_instance_functions.cpp

@@ -31,39 +31,6 @@
 
 extern std::mutex g_vulkanLock;
 
-/* See header for documentation. */
-template <>
-VKAPI_ATTR VkResult VKAPI_CALL layer_vkCreateDevice<user_tag>(
-    VkPhysicalDevice physicalDevice,
-    const VkDeviceCreateInfo* pCreateInfo,
-    const VkAllocationCallbacks* pAllocator,
-    VkDevice* pDevice
-) {
-    LAYER_TRACE(__func__);
-
-    // Use the default function for the heavy-lifting
-    auto res = layer_vkCreateDevice<default_tag>(physicalDevice, pCreateInfo, pAllocator, pDevice);
-    if (res != VK_SUCCESS)
-    {
-        return res;
-    }
-
-    // Cache flags indicating extension emulation
-    std::unique_lock<std::mutex> lock {g_vulkanLock};
-    auto* layer = Device::retrieve(*pDevice);
-
-    static const std::string target { VK_EXT_FRAME_BOUNDARY_EXTENSION_NAME };
-    for (auto& ext : layer->instance->injectedDeviceExtensions)
-    {
-        if (ext.first == target)
-        {
-            layer->isEmulatingExtFrameBoundary = true;
-        }
-    }
-
-    return res;
-}
-
 /* See Vulkan API for documentation. */
 template <>
 VKAPI_ATTR void VKAPI_CALL layer_vkGetPhysicalDeviceFeatures2<user_tag>(

layer_gpu_timeline/source/layer_instance_functions.hpp

@@ -29,14 +29,6 @@
 
 // Functions for devices
 
-/* See Vulkan API for documentation. */
-template <>
-VKAPI_ATTR VkResult VKAPI_CALL layer_vkCreateDevice<user_tag>(
-    VkPhysicalDevice physicalDevice,
-    const VkDeviceCreateInfo* pCreateInfo,
-    const VkAllocationCallbacks* pAllocator,
-    VkDevice* pDevice);
-
 /* See Vulkan API for documentation. */
 template <>
 VKAPI_ATTR void VKAPI_CALL layer_vkGetPhysicalDeviceFeatures2<user_tag>(