diff --git a/renderdoc/driver/shaders/spirv/spirv_editor.h b/renderdoc/driver/shaders/spirv/spirv_editor.h
index e8a3696dc..70037d928 100644
--- a/renderdoc/driver/shaders/spirv/spirv_editor.h
+++ b/renderdoc/driver/shaders/spirv/spirv_editor.h
@@ -179,9 +179,15 @@ public:
   // helper for AddConstant
   template <typename T>
   Id AddConstantImmediate(T t)
+  {
+    return AddConstantImmediate<T>(t, MakeId());
+  }
+
+  template <typename T>
+  Id AddConstantImmediate(T t, rdcspv::Id constantId)
   {
     Id typeId = DeclareType(scalar<T>());
-    rdcarray<uint32_t> words = {typeId.value(), MakeId().value()};
+    rdcarray<uint32_t> words = {typeId.value(), constantId.value()};
 
     words.resize(words.size() + (sizeof(T) + 3) / 4);