From c7ef7c42997c4da51bd8b336b0021062fe5d534c Mon Sep 17 00:00:00 2001
From: Joshua Ashton <joshua@froggi.es>
Date: Tue, 30 Apr 2024 02:08:30 +0100
Subject: [PATCH] layer: Fix double ptr in RemoveFromChain (and add vkroots
 checks)

---
 layer/VkLayer_FROG_gamescope_wsi.cpp | 2 +-
 subprojects/vkroots                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/layer/VkLayer_FROG_gamescope_wsi.cpp b/layer/VkLayer_FROG_gamescope_wsi.cpp
index 73cffcb8e..e785d10b0 100644
--- a/layer/VkLayer_FROG_gamescope_wsi.cpp
+++ b/layer/VkLayer_FROG_gamescope_wsi.cpp
@@ -557,7 +557,7 @@ namespace GamescopeWSILayer {
         const std::array<VkPresentModeKHR, 1> s_SingleMode = {{
           pPresentMode ? pPresentMode->presentMode : VK_PRESENT_MODE_FIFO_KHR,
         }};
-        auto [pPresentModeCompat, pPresentModeCompatParent] = vkroots::RemoveFromChain<VkSurfacePresentModeCompatibilityEXT>(&pSurfaceCapabilities);
+        auto [pPresentModeCompat, pPresentModeCompatParent] = vkroots::RemoveFromChain<VkSurfacePresentModeCompatibilityEXT>(pSurfaceCapabilities);
         if (pPresentModeCompat)
           vkroots::helpers::array(s_SingleMode, &pPresentModeCompat->presentModeCount, pPresentModeCompat->pPresentModes);
 
diff --git a/subprojects/vkroots b/subprojects/vkroots
index 16fc8dd56..5106d8a0d 160000
--- a/subprojects/vkroots
+++ b/subprojects/vkroots
@@ -1 +1 @@
-Subproject commit 16fc8dd5671738e6055eb0230427b8f12e012e23
+Subproject commit 5106d8a0df95de66cc58dc1ea37e69c99afc9540