Move custom printf & string_utils out of serialise/ folder

renderdoc/3rdparty/catch/catch.cpp

@@ -27,7 +27,7 @@
 #include "catch.hpp"
 #include "api/replay/renderdoc_replay.h"
 #include "serialise/serialiser.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 
 struct AppVeyorListener : Catch::TestEventListenerBase
 {

renderdoc/CMakeLists.txt

@@ -119,12 +119,12 @@ set(sources
     replay/replay_output.cpp
     replay/replay_controller.cpp
     replay/replay_controller.h
-    serialise/grisu2.cpp
     serialise/serialiser.cpp
     serialise/serialiser.h
-    serialise/string_utils.cpp
-    serialise/string_utils.h
-    serialise/utf8printf.cpp
+    strings/grisu2.cpp
+    strings/string_utils.cpp
+    strings/string_utils.h
+    strings/utf8printf.cpp
     3rdparty/jpeg-compressor/jpgd.cpp
     3rdparty/jpeg-compressor/jpgd.h
     3rdparty/jpeg-compressor/jpge.cpp

renderdoc/common/common.cpp

@@ -29,7 +29,7 @@
 #include <string>
 #include "common/threading.h"
 #include "os/os_specific.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 
 using std::string;
 

renderdoc/core/android.cpp

@@ -26,7 +26,7 @@
 #include <sstream>
 #include "api/replay/version.h"
 #include "core/core.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 
 namespace Android
 {

renderdoc/core/core.cpp

@@ -32,8 +32,8 @@
 #include "hooks/hooks.h"
 #include "replay/replay_driver.h"
 #include "serialise/serialiser.h"
-#include "serialise/string_utils.h"
 #include "stb/stb_image.h"
+#include "strings/string_utils.h"
 #include "crash_handler.h"
 
 template <>

renderdoc/core/plugins.cpp

@@ -24,7 +24,7 @@
 
 #include "core/plugins.h"
 #include "os/os_specific.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 
 std::string LocatePluginFile(const std::string &path, const std::string &fileName)
 {

renderdoc/core/remote_server.cpp

@@ -31,7 +31,7 @@
 #include "os/os_specific.h"
 #include "replay/replay_controller.h"
 #include "serialise/serialiser.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 #include "replay_proxy.h"
 #include "socket_helpers.h"
 

renderdoc/driver/d3d11/d3d11_analyse.cpp

@@ -32,7 +32,7 @@
 #include "maths/matrix.h"
 #include "maths/vec.h"
 #include "serialise/serialiser.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 #include "d3d11_context.h"
 #include "d3d11_debug.h"
 #include "d3d11_manager.h"

renderdoc/driver/d3d11/d3d11_common.cpp

@@ -28,7 +28,7 @@
 #include "driver/d3d11/d3d11_renderstate.h"
 #include "driver/d3d11/d3d11_resources.h"
 #include "serialise/serialiser.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 
 WrappedID3D11Device *D3D11MarkerRegion::device;
 

renderdoc/driver/d3d11/d3d11_context.cpp

@@ -28,7 +28,7 @@
 #include "driver/d3d11/d3d11_manager.h"
 #include "driver/d3d11/d3d11_renderstate.h"
 #include "driver/d3d11/d3d11_resources.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 
 WRAPPED_POOL_INST(WrappedID3D11DeviceContext);
 WRAPPED_POOL_INST(WrappedID3D11CommandList);

renderdoc/driver/d3d11/d3d11_context1_wrap.cpp

@@ -24,7 +24,7 @@
  ******************************************************************************/
 
 #include "d3d11_context.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 #include "d3d11_renderstate.h"
 #include "d3d11_resources.h"
 

renderdoc/driver/d3d11/d3d11_context_wrap.cpp

@@ -28,7 +28,7 @@
 #include "driver/d3d11/d3d11_renderstate.h"
 #include "driver/d3d11/d3d11_resources.h"
 #include "driver/dx/official/dxgi1_3.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 
 #ifndef DXGI_ERROR_INVALID_CALL
 #define DXGI_ERROR_INVALID_CALL MAKE_DXGI_HRESULT(1)

renderdoc/driver/d3d11/d3d11_debug.cpp

@@ -33,8 +33,8 @@
 #include "maths/camera.h"
 #include "maths/formatpacking.h"
 #include "maths/matrix.h"
-#include "serialise/string_utils.h"
 #include "stb/stb_truetype.h"
+#include "strings/string_utils.h"
 #include "d3d11_context.h"
 #include "d3d11_manager.h"
 #include "d3d11_renderstate.h"

renderdoc/driver/d3d11/d3d11_device.cpp

@@ -31,7 +31,7 @@
 #include "driver/dxgi/dxgi_wrapped.h"
 #include "jpeg-compressor/jpge.h"
 #include "maths/formatpacking.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 
 const char *D3D11ChunkNames[] = {
     "ID3D11Device::Initialisation",

renderdoc/driver/d3d11/d3d11_replay.cpp

@@ -27,7 +27,7 @@
 #include "driver/dx/official/d3dcompiler.h"
 #include "driver/ihv/amd/amd_isa.h"
 #include "driver/shaders/dxbc/dxbc_debug.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 #include "d3d11_context.h"
 #include "d3d11_debug.h"
 #include "d3d11_device.h"

renderdoc/driver/d3d12/d3d12_debug.cpp

@@ -31,8 +31,8 @@
 #include "maths/formatpacking.h"
 #include "maths/matrix.h"
 #include "maths/vec.h"
-#include "serialise/string_utils.h"
 #include "stb/stb_truetype.h"
+#include "strings/string_utils.h"
 #include "d3d12_command_queue.h"
 #include "d3d12_device.h"
 

renderdoc/driver/d3d12/d3d12_device.cpp

@@ -29,7 +29,7 @@
 #include "driver/ihv/amd/official/DXExt/AmdExtD3D.h"
 #include "jpeg-compressor/jpge.h"
 #include "maths/formatpacking.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 #include "d3d12_command_list.h"
 #include "d3d12_command_queue.h"
 #include "d3d12_resources.h"

renderdoc/driver/gl/gl_common.cpp

@@ -25,7 +25,7 @@
 
 #include "gl_common.h"
 #include "core/core.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 #include "gl_driver.h"
 
 bool HasExt[GLExtension_Count] = {};

renderdoc/driver/gl/gl_debug.cpp

@@ -30,7 +30,7 @@
 #include "maths/camera.h"
 #include "maths/formatpacking.h"
 #include "maths/matrix.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 #include "gl_driver.h"
 #include "gl_replay.h"
 #include "gl_resources.h"

renderdoc/driver/gl/gl_driver.cpp

@@ -31,8 +31,8 @@
 #include "jpeg-compressor/jpge.h"
 #include "maths/matrix.h"
 #include "maths/vec.h"
-#include "serialise/string_utils.h"
 #include "stb/stb_truetype.h"
+#include "strings/string_utils.h"
 
 #define OPENGL 1
 #include "data/glsl/debuguniforms.h"

renderdoc/driver/gl/gl_hooks_egl.cpp

@@ -28,7 +28,7 @@
 #include "driver/gl/gl_common.h"
 #include "driver/gl/gl_driver.h"
 #include "hooks/hooks.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 #include "gl_hooks_linux_shared.h"
 
 typedef __eglMustCastToProperFunctionPointerType (*PFN_eglGetProcAddress)(const char *procname);

renderdoc/driver/gl/gl_hooks_linux.cpp

@@ -29,7 +29,7 @@
 #include "driver/gl/gl_common.h"
 #include "driver/gl/gl_driver.h"
 #include "hooks/hooks.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 #include "gl_hooks_linux_shared.h"
 
 typedef GLXContext (*PFNGLXCREATECONTEXTPROC)(Display *dpy, XVisualInfo *vis, GLXContext shareList,

renderdoc/driver/gl/gl_hooks_linux_shared.cpp

@@ -30,7 +30,7 @@
 #include "driver/gl/gl_hookset.h"
 #include "driver/gl/gl_hookset_defs.h"
 #include "hooks/hooks.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 
 GLHookSet GL;
 WrappedOpenGL *m_GLDriver;

renderdoc/driver/gl/gl_hooks_win32.cpp

@@ -29,7 +29,7 @@
 #include "driver/gl/gl_hookset.h"
 #include "driver/gl/gl_hookset_defs.h"
 #include "hooks/hooks.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 
 #define DLL_NAME "opengl32.dll"
 

renderdoc/driver/gl/gl_replay.cpp

@@ -26,7 +26,7 @@
 #include "gl_replay.h"
 #include "driver/ihv/amd/amd_isa.h"
 #include "maths/matrix.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 #include "gl_driver.h"
 #include "gl_resources.h"
 

renderdoc/driver/gl/wrappers/gl_buffer_funcs.cpp

@@ -26,7 +26,7 @@
 #include "../gl_driver.h"
 #include "3rdparty/tinyfiledialogs/tinyfiledialogs.h"
 #include "common/common.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 
 #pragma region Buffers
 

renderdoc/driver/gl/wrappers/gl_debug_funcs.cpp

@@ -25,7 +25,7 @@
 
 #include "../gl_driver.h"
 #include "common/common.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 
 bool WrappedOpenGL::Serialise_glObjectLabel(GLenum identifier, GLuint name, GLsizei length,
                                             const GLchar *label)

renderdoc/driver/gl/wrappers/gl_draw_funcs.cpp

@@ -25,7 +25,7 @@
 
 #include "../gl_driver.h"
 #include "common/common.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 
 bool WrappedOpenGL::Serialise_glDispatchCompute(GLuint num_groups_x, GLuint num_groups_y,
                                                 GLuint num_groups_z)

renderdoc/driver/gl/wrappers/gl_framebuffer_funcs.cpp

@@ -25,7 +25,7 @@
 
 #include "../gl_driver.h"
 #include "common/common.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 
 bool WrappedOpenGL::Serialise_glGenFramebuffers(GLsizei n, GLuint *framebuffers)
 {

renderdoc/driver/gl/wrappers/gl_get_funcs.cpp

@@ -25,7 +25,7 @@
 
 #include "../gl_driver.h"
 #include "common/common.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 
 GLenum WrappedOpenGL::glGetError()
 {

renderdoc/driver/gl/wrappers/gl_interop_funcs.cpp

@@ -24,7 +24,7 @@
 
 #include "../gl_driver.h"
 #include "common/common.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 
 #if ENABLED(RDOC_WIN32) && ENABLED(RENDERDOC_DX_GL_INTEROP)
 

renderdoc/driver/gl/wrappers/gl_query_funcs.cpp

@@ -25,7 +25,7 @@
 
 #include "../gl_driver.h"
 #include "common/common.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 
 bool WrappedOpenGL::Serialise_glFenceSync(GLsync real, GLenum condition, GLbitfield flags)
 {

renderdoc/driver/gl/wrappers/gl_sampler_funcs.cpp

@@ -25,7 +25,7 @@
 
 #include "../gl_driver.h"
 #include "common/common.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 
 bool WrappedOpenGL::Serialise_glGenSamplers(GLsizei n, GLuint *samplers)
 {

renderdoc/driver/gl/wrappers/gl_shader_funcs.cpp

@@ -27,7 +27,7 @@
 #include "../gl_shader_refl.h"
 #include "common/common.h"
 #include "driver/shaders/spirv/spirv_common.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 
 void WrappedOpenGL::ShaderData::Compile(WrappedOpenGL &gl, ResourceId id, GLuint realShader)
 {

renderdoc/driver/gl/wrappers/gl_state_funcs.cpp

@@ -25,7 +25,7 @@
 
 #include "../gl_driver.h"
 #include "common/common.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 
 bool WrappedOpenGL::Serialise_glBlendFunc(GLenum sfactor, GLenum dfactor)
 {

renderdoc/driver/gl/wrappers/gl_texture_funcs.cpp

@@ -25,7 +25,7 @@
 
 #include "../gl_driver.h"
 #include "common/common.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 
 // NOTE: Handling of ARB_dsa vs. EXT_dsa
 //

renderdoc/driver/gl/wrappers/gl_uniform_funcs.cpp

@@ -25,7 +25,7 @@
 
 #include "../gl_driver.h"
 #include "common/common.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 
 bool WrappedOpenGL::Serialise_glProgramUniformVector(GLuint program, GLint location, GLsizei count,
                                                      const void *value, UniformType type)

renderdoc/driver/ihv/amd/amd_counters.cpp

@@ -29,7 +29,7 @@
 #include "official/GPUPerfAPI/Include/GPUPerfAPI.h"
 #include "official/GPUPerfAPI/Include/GPUPerfAPIFunctionTypes.h"
 
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 
 AMDCounters::AMDCounters() : m_pGPUPerfAPI(NULL)
 {

renderdoc/driver/ihv/amd/amd_isa.cpp

@@ -26,7 +26,7 @@
 #include "common/common.h"
 #include "core/plugins.h"
 #include "driver/shaders/spirv/spirv_common.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 #include "amd_isa_devices.h"
 
 namespace GCNISA

renderdoc/driver/shaders/dxbc/dxbc_compile.cpp

@@ -24,7 +24,7 @@
 
 #include "dxbc_compile.h"
 #include "common/common.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 
 // gives us an address to identify this dll with
 static int dllLocator = 0;

renderdoc/driver/shaders/dxbc/dxbc_disassemble.cpp

@@ -28,7 +28,7 @@
 #include "common/common.h"
 #include "core/core.h"
 #include "serialise/serialiser.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 #include "dxbc_inspect.h"
 
 namespace DXBC

renderdoc/driver/shaders/dxbc/dxbc_inspect.cpp

@@ -27,7 +27,7 @@
 #include "api/app/renderdoc_app.h"
 #include "common/common.h"
 #include "serialise/serialiser.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 #include "dxbc_sdbg.h"
 #include "dxbc_spdb.h"
 

renderdoc/driver/vulkan/vk_core.cpp

@@ -25,7 +25,7 @@
 #include "vk_core.h"
 #include "jpeg-compressor/jpge.h"
 #include "maths/formatpacking.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 #include "vk_debug.h"
 
 const char *VkChunkNames[] = {

renderdoc/driver/vulkan/vk_debug.cpp

@@ -32,7 +32,7 @@
 #include "maths/camera.h"
 #include "maths/formatpacking.h"
 #include "maths/matrix.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 #include "vk_core.h"
 
 #define VULKAN 1

renderdoc/driver/vulkan/vk_layer.cpp

@@ -30,7 +30,7 @@
 #include "common/threading.h"
 #include "hooks/hooks.h"
 #include "os/os_specific.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 #include "vk_common.h"
 #include "vk_core.h"
 #include "vk_hookset_defs.h"

renderdoc/driver/vulkan/vk_linux.cpp

@@ -24,7 +24,7 @@
 
 #include "api/replay/renderdoc_replay.h"
 #include "api/replay/version.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 
 #include <errno.h>
 #include <sys/stat.h>

renderdoc/driver/vulkan/vk_replay.cpp

@@ -27,7 +27,7 @@
 #include "driver/ihv/amd/amd_isa.h"
 #include "maths/camera.h"
 #include "maths/matrix.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 #include "vk_core.h"
 #include "vk_debug.h"
 #include "vk_resources.h"

renderdoc/os/os_specific.cpp

@@ -25,7 +25,7 @@
 
 #include "os/os_specific.h"
 #include <stdarg.h>
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 
 using std::string;
 

renderdoc/os/posix/linux/linux_hook.cpp

@@ -30,7 +30,7 @@
 #include "common/threading.h"
 #include "os/os_specific.h"
 #include "os/posix/posix_hook.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 
 // depending on symbol resolution, dlopen could get called really early.
 // until we've initialised, just skip any fancy stuff

renderdoc/os/posix/linux/linux_stringio.cpp

@@ -34,7 +34,7 @@
 #include "api/app/renderdoc_app.h"
 #include "common/threading.h"
 #include "os/os_specific.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 
 #if ENABLED(RDOC_XLIB)
 #include <X11/Xlib.h>

renderdoc/os/posix/posix_network.cpp

@@ -35,7 +35,7 @@
 #include <unistd.h>
 #include <string>
 #include "os/os_specific.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 
 using std::string;
 

renderdoc/os/posix/posix_process.cpp

@@ -33,7 +33,7 @@
 #include <unistd.h>
 #include "api/app/renderdoc_app.h"
 #include "os/os_specific.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 
 // defined in foo/foo_process.cpp
 char **GetCurrentEnvironment();

renderdoc/os/posix/posix_stringio.cpp

@@ -39,7 +39,7 @@
 #include "api/app/renderdoc_app.h"
 #include "common/threading.h"
 #include "os/os_specific.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 
 using std::string;
 

renderdoc/os/win32/sys_win32_hooks.cpp

@@ -27,7 +27,7 @@
 #include "api/replay/renderdoc_replay.h"
 #include "core/core.h"
 #include "hooks/hooks.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 
 #define DLL_NAME "kernel32.dll"
 

renderdoc/os/win32/win32_callstack.cpp

@@ -38,7 +38,7 @@
 #include "core/core.h"
 #include "dbghelp/dbghelp.h"
 #include "os/os_specific.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 
 #include "dia2_stubs.h"
 

renderdoc/os/win32/win32_hook.cpp

@@ -33,7 +33,7 @@
 #include <vector>
 #include "common/threading.h"
 #include "os/os_specific.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 
 #define VERBOSE_DEBUG_HOOK OPTION_OFF
 

renderdoc/os/win32/win32_libentry.cpp

@@ -29,7 +29,7 @@
 #include "common/common.h"
 #include "core/core.h"
 #include "hooks/hooks.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 
 static BOOL add_hooks()
 {

renderdoc/os/win32/win32_process.cpp

@@ -31,7 +31,7 @@
 #include <string>
 #include "core/core.h"
 #include "os/os_specific.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 
 using std::string;
 

renderdoc/os/win32/win32_stringio.cpp

@@ -32,7 +32,7 @@
 #include <set>
 #include "api/app/renderdoc_app.h"
 #include "os/os_specific.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 
 using std::set;
 using std::wstring;

renderdoc/renderdoc.vcxproj

@@ -189,7 +189,7 @@
     <ClInclude Include="replay\replay_driver.h" />
     <ClInclude Include="replay\replay_controller.h" />
     <ClInclude Include="serialise\serialiser.h" />
-    <ClInclude Include="serialise\string_utils.h" />
+    <ClInclude Include="strings\string_utils.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="3rdparty\catch\catch.cpp" />
@@ -391,10 +391,10 @@
     <ClCompile Include="replay\replay_driver.cpp" />
     <ClCompile Include="replay\replay_output.cpp" />
     <ClCompile Include="replay\replay_controller.cpp" />
-    <ClCompile Include="serialise\grisu2.cpp" />
     <ClCompile Include="serialise\serialiser.cpp" />
-    <ClCompile Include="serialise\string_utils.cpp" />
-    <ClCompile Include="serialise\utf8printf.cpp" />
+    <ClCompile Include="strings\grisu2.cpp" />
+    <ClCompile Include="strings\string_utils.cpp" />
+    <ClCompile Include="strings\utf8printf.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="data\renderdoc.rc" />

renderdoc/renderdoc.vcxproj.filters

@@ -219,9 +219,6 @@
     <ClInclude Include="3rdparty\stb\stb_truetype.h">
       <Filter>3rdparty\stb</Filter>
     </ClInclude>
-    <ClInclude Include="serialise\string_utils.h">
-      <Filter>Common\Strings</Filter>
-    </ClInclude>
     <ClInclude Include="3rdparty\tinyexr\tinyexr.h">
       <Filter>3rdparty\tinyexr</Filter>
     </ClInclude>
@@ -342,6 +339,9 @@
     <ClInclude Include="3rdparty\pugixml\pugixml.hpp">
       <Filter>3rdparty\pugixml</Filter>
     </ClInclude>
+    <ClInclude Include="strings\string_utils.h">
+      <Filter>Common\Strings</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="maths\camera.cpp">
@@ -419,15 +419,6 @@
     <ClCompile Include="core\image_viewer.cpp">
       <Filter>Core</Filter>
     </ClCompile>
-    <ClCompile Include="serialise\grisu2.cpp">
-      <Filter>Common\Strings</Filter>
-    </ClCompile>
-    <ClCompile Include="serialise\utf8printf.cpp">
-      <Filter>Common\Strings</Filter>
-    </ClCompile>
-    <ClCompile Include="serialise\string_utils.cpp">
-      <Filter>Common\Strings</Filter>
-    </ClCompile>
     <ClCompile Include="3rdparty\tinyexr\tinyexr.cpp">
       <Filter>3rdparty\tinyexr</Filter>
     </ClCompile>
@@ -581,6 +572,15 @@
     <ClCompile Include="3rdparty\pugixml\pugixml.cpp">
       <Filter>3rdparty\pugixml</Filter>
     </ClCompile>
+    <ClCompile Include="strings\grisu2.cpp">
+      <Filter>Common\Strings</Filter>
+    </ClCompile>
+    <ClCompile Include="strings\string_utils.cpp">
+      <Filter>Common\Strings</Filter>
+    </ClCompile>
+    <ClCompile Include="strings\utf8printf.cpp">
+      <Filter>Common\Strings</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="os\win32\comexport.def">

renderdoc/replay/entry_points.cpp

@@ -31,7 +31,7 @@
 #include "core/core.h"
 #include "maths/camera.h"
 #include "maths/formatpacking.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 
 // these entry points are for the replay/analysis side - not for the application.
 

renderdoc/replay/replay_controller.cpp

@@ -32,9 +32,9 @@
 #include "maths/formatpacking.h"
 #include "os/os_specific.h"
 #include "serialise/serialiser.h"
-#include "serialise/string_utils.h"
 #include "stb/stb_image.h"
 #include "stb/stb_image_write.h"
+#include "strings/string_utils.h"
 #include "tinyexr/tinyexr.h"
 
 float ConvertComponent(const ResourceFormat &fmt, byte *data)

renderdoc/replay/replay_output.cpp

@@ -25,7 +25,7 @@
 
 #include "common/common.h"
 #include "maths/matrix.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 #include "replay_controller.h"
 
 static uint64_t GetHandle(WindowingSystem system, void *data)

renderdoc/serialise/serialiser.cpp

@@ -28,7 +28,7 @@
 #include "3rdparty/lz4/lz4.h"
 #include "common/timing.h"
 #include "core/core.h"
-#include "serialise/string_utils.h"
+#include "strings/string_utils.h"
 
 #if ENABLED(RDOC_MSVS)
 // warning C4422: 'snprintf' : too many arguments passed for format string