From 955f41a07467b81875ce5809edcd879900f0e86d Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Wed, 1 Aug 2018 18:38:28 +0100
Subject: [PATCH] Don't allow registered x86 layer to hide a non-registered x64
 layer

---
 renderdoc/driver/vulkan/vk_win32.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/renderdoc/driver/vulkan/vk_win32.cpp b/renderdoc/driver/vulkan/vk_win32.cpp
index 043970a65..e6fddebff 100644
--- a/renderdoc/driver/vulkan/vk_win32.cpp
+++ b/renderdoc/driver/vulkan/vk_win32.cpp
@@ -282,15 +282,18 @@ bool VulkanReplay::CheckVulkanLayer(VulkanLayerFlags &flags, std::vector<std::st
   {
     key = GetImplicitLayersKey(false, true);
 
-    // if we're on 64-bit, the layer isn't registered unless both keys are registered.
-    thisRegistered = false;
-
     if(key)
     {
-      thisRegistered = ProcessImplicitLayersKey(key, wow6432Path, &otherJSONs, false);
+      // if we're on 64-bit, the layer isn't registered unless both keys are registered.
+      thisRegistered &= ProcessImplicitLayersKey(key, wow6432Path, &otherJSONs, false);
 
       RegCloseKey(key);
     }
+    else
+    {
+      flags = VulkanLayerFlags::NeedElevation | VulkanLayerFlags::RegisterAll;
+      return true;
+    }
   }
 #endif