From 320b1cddd4fb0fcb1ac29a849114f00b3c9597f6 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Fri, 24 Apr 2020 18:19:23 +0100
Subject: [PATCH] Fix compilation on stable builds with constant settings

---
 renderdoc/core/settings.h                  | 2 +-
 renderdoc/driver/vulkan/vk_shaderdebug.cpp | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/renderdoc/core/settings.h b/renderdoc/core/settings.h
index e39fc6a1a..c065a3bc9 100644
--- a/renderdoc/core/settings.h
+++ b/renderdoc/core/settings.h
@@ -67,7 +67,7 @@ CONFIG_SUPPORT_TYPE(rdcarray<rdcstr>);
 #define RDOC_DEBUG_CONFIG(type, name, defaultValue, description)                         \
   static ConfigVarRegistration<type> CONCAT(config, __LINE__)(                           \
       STRING_LITERAL(STRINGIZE(name)), defaultValue, true, STRING_LITERAL(description)); \
-  static constexpr type name = defaultValue;
+  static const type name = defaultValue;
 
 #else
 
diff --git a/renderdoc/driver/vulkan/vk_shaderdebug.cpp b/renderdoc/driver/vulkan/vk_shaderdebug.cpp
index 28e12cdea..453e070a2 100644
--- a/renderdoc/driver/vulkan/vk_shaderdebug.cpp
+++ b/renderdoc/driver/vulkan/vk_shaderdebug.cpp
@@ -3424,9 +3424,10 @@ ShaderDebugTrace *VulkanReplay::DebugPixel(uint32_t eventId, uint32_t x, uint32_
       }
     }
 
-    if(Vulkan_Debug_ShaderDebugLogging && !usePrimitiveID)
+    if(Vulkan_Debug_ShaderDebugLogging)
     {
-      RDCLOG("Geometry shader doesn't export primitive ID, can't use");
+      if(!usePrimitiveID)
+        RDCLOG("Geometry shader doesn't export primitive ID, can't use");
     }
   }
   else