From bfad3dac2f27870541fecb1dd7125ef8abc517ba Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Thu, 5 Sep 2019 10:38:53 +0100
Subject: [PATCH] Don't set optimisation level until we have replay options on
 Vulkan

---
 renderdoc/driver/vulkan/vk_core.cpp                  | 2 --
 renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/renderdoc/driver/vulkan/vk_core.cpp b/renderdoc/driver/vulkan/vk_core.cpp
index e7d543a04..9a86e35ab 100644
--- a/renderdoc/driver/vulkan/vk_core.cpp
+++ b/renderdoc/driver/vulkan/vk_core.cpp
@@ -162,8 +162,6 @@ WrappedVulkan::WrappedVulkan() : m_RenderState(this, &m_CreationInfo)
   {
     m_FrameCaptureRecord = NULL;
 
-    m_ResourceManager->SetOptimisationLevel(m_ReplayOptions.optimisation);
-
     ResourceIDGen::SetReplayResourceIDs();
   }
 }
diff --git a/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp
index 796cb1fc6..0de61f21e 100644
--- a/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp
+++ b/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp
@@ -177,6 +177,8 @@ ReplayStatus WrappedVulkan::Initialise(VkInitParams &params, uint64_t sectionVer
   m_SectionVersion = sectionVersion;
   m_ReplayOptions = opts;
 
+  m_ResourceManager->SetOptimisationLevel(m_ReplayOptions.optimisation);
+
   StripUnwantedLayers(params.Layers);
   StripUnwantedExtensions(params.Extensions);