Moved var_dispatch_helpers.h to replay/common folder

To enable sharing ShaderVariable helpers for the SPIRV and DXIL Shader Debuggers

renderdoc/CMakeLists.txt

@@ -197,6 +197,7 @@ set(sources
     replay/replay_output.cpp
     replay/replay_controller.cpp
     replay/replay_controller.h
+    replay/common/var_dispatch_helpers.h
     serialise/serialiser.cpp
     serialise/serialiser.h
     serialise/lz4io.cpp

renderdoc/driver/shaders/spirv/CMakeLists.txt

@@ -115,7 +115,6 @@ set(sources
     spirv_processor.h
     spirv_disassemble.cpp
     spirv_stringise.cpp
-    var_dispatch_helpers.h
     ${glslang_sources})
 
 add_definitions(-DAMD_EXTENSIONS)

renderdoc/driver/shaders/spirv/renderdoc_spirv.vcxproj

@@ -275,7 +275,6 @@
     <ClInclude Include="spirv_op_helpers.h" />
     <ClInclude Include="spirv_processor.h" />
     <ClInclude Include="spirv_reflect.h" />
-    <ClInclude Include="var_dispatch_helpers.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

renderdoc/driver/shaders/spirv/renderdoc_spirv.vcxproj.filters

@@ -305,7 +305,6 @@
     </ClInclude>
     <ClInclude Include="spirv_processor.h" />
     <ClInclude Include="spirv_debug.h" />
-    <ClInclude Include="var_dispatch_helpers.h" />
     <ClInclude Include="..\..\..\3rdparty\glslang\SPIRV\GLSL.ext.ARM.h">
       <Filter>3rdparty\glslang</Filter>
     </ClInclude>

renderdoc/driver/shaders/spirv/spirv_debug.cpp

@@ -29,8 +29,8 @@
 #include "core/settings.h"
 #include "maths/half_convert.h"
 #include "os/os_specific.h"
+#include "replay/common/var_dispatch_helpers.h"
 #include "spirv_op_helpers.h"
-#include "var_dispatch_helpers.h"
 
 static bool ContainsNaNInf(const ShaderVariable &var)
 {

renderdoc/driver/shaders/spirv/spirv_debug_glsl450.cpp

@@ -27,7 +27,7 @@
 #include "maths/half_convert.h"
 #include "maths/matrix.h"
 #include "os/os_specific.h"
-#include "var_dispatch_helpers.h"
+#include "replay/common/var_dispatch_helpers.h"
 
 // add some overloads we'll use to avoid the mess of math function definitions across compilers and
 // C/C++

renderdoc/driver/shaders/spirv/spirv_debug_setup.cpp

@@ -25,9 +25,9 @@
 #include "spirv_debug.h"
 #include "common/formatting.h"
 #include "core/settings.h"
+#include "replay/common/var_dispatch_helpers.h"
 #include "spirv_op_helpers.h"
 #include "spirv_reflect.h"
-#include "var_dispatch_helpers.h"
 
 RDOC_CONFIG(bool, Vulkan_Debug_UseDebugColumnInformation, false,
             "Control whether column information should be read from vulkan debug info.");

renderdoc/driver/shaders/spirv/spirv_processor.cpp

@@ -25,8 +25,8 @@
 #include "spirv_processor.h"
 #include "common/formatting.h"
 #include "maths/half_convert.h"
+#include "replay/common/var_dispatch_helpers.h"
 #include "spirv_op_helpers.h"
-#include "var_dispatch_helpers.h"
 
 namespace rdcspv
 {

renderdoc/driver/vulkan/vk_shaderdebug.cpp

@@ -26,8 +26,8 @@
 #include "driver/shaders/spirv/spirv_debug.h"
 #include "driver/shaders/spirv/spirv_editor.h"
 #include "driver/shaders/spirv/spirv_op_helpers.h"
-#include "driver/shaders/spirv/var_dispatch_helpers.h"
 #include "maths/formatpacking.h"
+#include "replay/common/var_dispatch_helpers.h"
 #include "vk_core.h"
 #include "vk_debug.h"
 #include "vk_replay.h"

renderdoc/renderdoc.vcxproj

@@ -244,6 +244,7 @@
     </ClInclude>
     <ClInclude Include="os\win32\dia2_stubs.h" />
     <ClInclude Include="os\win32\win32_specific.h" />
+    <ClInclude Include="replay\common\var_dispatch_helpers.h" />
     <ClInclude Include="replay\dummy_driver.h" />
     <ClInclude Include="replay\replay_driver.h" />
     <ClInclude Include="replay\replay_controller.h" />

renderdoc/renderdoc.vcxproj.filters

@@ -139,6 +139,9 @@
     <Filter Include="3rdparty\md5">
       <UniqueIdentifier>{fcbf71ce-3767-435c-9aa2-e1327b9016f4}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Replay\Common">
+      <UniqueIdentifier>{02773850-117a-47d9-b238-d5d4b96468b3}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="maths\camera.h">
@@ -564,6 +567,9 @@
     <ClInclude Include="core\gpu_address_range_tracker.h">
       <Filter>Core</Filter>
     </ClInclude>
+    <ClInclude Include="replay\common\var_dispatch_helpers.h">
+      <Filter>Replay\Common</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="maths\camera.cpp">