From 19cb3c7cb3d010b1652812ee45469ef01b79ebe7 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Wed, 12 Feb 2020 14:01:46 +0000
Subject: [PATCH] Move SpecConstant to a common header for re-use

---
 renderdoc/driver/shaders/spirv/spirv_common.h  |  9 +++++++++
 renderdoc/driver/shaders/spirv/spirv_reflect.h | 12 ++----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/renderdoc/driver/shaders/spirv/spirv_common.h b/renderdoc/driver/shaders/spirv/spirv_common.h
index 4e638723f..cc7db5ffe 100644
--- a/renderdoc/driver/shaders/spirv/spirv_common.h
+++ b/renderdoc/driver/shaders/spirv/spirv_common.h
@@ -219,4 +219,13 @@ public:
 
 };    // namespace rdcspv
 
+struct SpecConstant
+{
+  SpecConstant() = default;
+  SpecConstant(uint32_t id, uint64_t val, size_t size) : specID(id), value(val), dataSize(size) {}
+  uint32_t specID = 0;
+  uint64_t value = 0;
+  size_t dataSize = 0;
+};
+
 DECLARE_STRINGISE_TYPE(rdcspv::Id);
diff --git a/renderdoc/driver/shaders/spirv/spirv_reflect.h b/renderdoc/driver/shaders/spirv/spirv_reflect.h
index 0b06c5548..2c5614c41 100644
--- a/renderdoc/driver/shaders/spirv/spirv_reflect.h
+++ b/renderdoc/driver/shaders/spirv/spirv_reflect.h
@@ -67,15 +67,6 @@ struct SPIRVPatchData
   Topology outTopo = Topology::Unknown;
 };
 
-struct SpecConstant
-{
-  SpecConstant() = default;
-  SpecConstant(uint32_t id, uint64_t val, size_t size) : specID(id), value(val), dataSize(size) {}
-  uint32_t specID = 0;
-  uint64_t value = 0;
-  size_t dataSize = 0;
-};
-
 namespace rdcspv
 {
 struct SourceFile
@@ -137,7 +128,8 @@ private:
 
   rdcarray<MemberName> memberNames;
 };
-};
+
+};    // namespace rdcspv
 
 static const uint32_t SpecializationConstantBindSet = 1234567;
 static const uint32_t PushConstantBindSet = 1234568;