WSI: prefetcher: fix issue w/ attempting to prefetch xcb stuff for pu…

…re wayland surfaces
ValveSoftware · Jun 19, 2024 · 1b59621 · 1b59621
1 parent b80fa9b
commit 1b59621
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/layer/VkLayer_FROG_gamescope_wsi.cpp b/layer/VkLayer_FROG_gamescope_wsi.cpp
@@ -1234,7 +1234,7 @@ namespace GamescopeWSILayer {
             continue;
           }
 
-          xcb::Prefetcher prefetcher(gamescopeSurface->connection, gamescopeSurface->window);
+          auto prefetcher = xcb::Prefetcher::GetPrefetcherIf(!gamescopeSurface->isWayland(), gamescopeSurface->connection, gamescopeSurface->window);
           const bool canBypass = gamescopeSurface->canBypassXWayland();
           if (canBypass != gamescopeSwapchain->isBypassingXWayland)
             UpdateSwapchainResult(canBypass ? VK_SUBOPTIMAL_KHR : VK_ERROR_OUT_OF_DATE_KHR);

diff --git a/layer/xcb_helpers.hpp b/layer/xcb_helpers.hpp
@@ -16,6 +16,13 @@ namespace xcb {
 
   //Note: this class is currently only meant to be used within GamescopeWSILayer::VkDeviceOverrides::QueuePresentKHR:
   struct Prefetcher {
+    static std::optional<Prefetcher> GetPrefetcherIf(bool bCond, xcb_connection_t* connection, const xcb_window_t window) {
+       if (bCond)
+         return std::optional<Prefetcher>(std::in_place_t{}, connection, window);
+
+       return std::nullopt;
+    }
+
     explicit Prefetcher(xcb_connection_t* connection, const xcb_window_t window) {
         g_cache = {
             .window = window,
@@ -90,7 +97,7 @@ namespace xcb {
         inline Reply<Reply_RetType> operator()(xcb_connection_t* conn, xcb_window_t window) {
             const bool tryCached = pthread_equal(g_cache_tid, pthread_self())
                                    && g_cache.window == window;
-            if (!tryCached) [[unlikely]]
+            if (!tryCached)
                 return Reply<Reply_RetType> { m_replyFunc(conn, m_cookieFunc(conn, window), nullptr) };
 
             auto ret = getCachedReply(conn);