From 276783b94862e718fcc065ffbb221f1b65e14a33 Mon Sep 17 00:00:00 2001 From: baldurk Date: Fri, 1 Sep 2017 14:02:10 +0100 Subject: [PATCH] Move custom printf & string_utils out of serialise/ folder --- renderdoc/3rdparty/catch/catch.cpp | 2 +- renderdoc/CMakeLists.txt | 8 +++---- renderdoc/common/common.cpp | 2 +- renderdoc/core/android.cpp | 2 +- renderdoc/core/core.cpp | 2 +- renderdoc/core/plugins.cpp | 2 +- renderdoc/core/remote_server.cpp | 2 +- renderdoc/driver/d3d11/d3d11_analyse.cpp | 2 +- renderdoc/driver/d3d11/d3d11_common.cpp | 2 +- renderdoc/driver/d3d11/d3d11_context.cpp | 2 +- .../driver/d3d11/d3d11_context1_wrap.cpp | 2 +- renderdoc/driver/d3d11/d3d11_context_wrap.cpp | 2 +- renderdoc/driver/d3d11/d3d11_debug.cpp | 2 +- renderdoc/driver/d3d11/d3d11_device.cpp | 2 +- renderdoc/driver/d3d11/d3d11_replay.cpp | 2 +- renderdoc/driver/d3d12/d3d12_debug.cpp | 2 +- renderdoc/driver/d3d12/d3d12_device.cpp | 2 +- renderdoc/driver/gl/gl_common.cpp | 2 +- renderdoc/driver/gl/gl_debug.cpp | 2 +- renderdoc/driver/gl/gl_driver.cpp | 2 +- renderdoc/driver/gl/gl_hooks_egl.cpp | 2 +- renderdoc/driver/gl/gl_hooks_linux.cpp | 2 +- renderdoc/driver/gl/gl_hooks_linux_shared.cpp | 2 +- renderdoc/driver/gl/gl_hooks_win32.cpp | 2 +- renderdoc/driver/gl/gl_replay.cpp | 2 +- .../driver/gl/wrappers/gl_buffer_funcs.cpp | 2 +- .../driver/gl/wrappers/gl_debug_funcs.cpp | 2 +- .../driver/gl/wrappers/gl_draw_funcs.cpp | 2 +- .../gl/wrappers/gl_framebuffer_funcs.cpp | 2 +- renderdoc/driver/gl/wrappers/gl_get_funcs.cpp | 2 +- .../driver/gl/wrappers/gl_interop_funcs.cpp | 2 +- .../driver/gl/wrappers/gl_query_funcs.cpp | 2 +- .../driver/gl/wrappers/gl_sampler_funcs.cpp | 2 +- .../driver/gl/wrappers/gl_shader_funcs.cpp | 2 +- .../driver/gl/wrappers/gl_state_funcs.cpp | 2 +- .../driver/gl/wrappers/gl_texture_funcs.cpp | 2 +- .../driver/gl/wrappers/gl_uniform_funcs.cpp | 2 +- renderdoc/driver/ihv/amd/amd_counters.cpp | 2 +- renderdoc/driver/ihv/amd/amd_isa.cpp | 2 +- .../driver/shaders/dxbc/dxbc_compile.cpp | 2 +- .../driver/shaders/dxbc/dxbc_disassemble.cpp | 2 +- .../driver/shaders/dxbc/dxbc_inspect.cpp | 2 +- renderdoc/driver/vulkan/vk_core.cpp | 2 +- renderdoc/driver/vulkan/vk_debug.cpp | 2 +- renderdoc/driver/vulkan/vk_layer.cpp | 2 +- renderdoc/driver/vulkan/vk_linux.cpp | 2 +- renderdoc/driver/vulkan/vk_replay.cpp | 2 +- renderdoc/os/os_specific.cpp | 2 +- renderdoc/os/posix/linux/linux_hook.cpp | 2 +- renderdoc/os/posix/linux/linux_stringio.cpp | 2 +- renderdoc/os/posix/posix_network.cpp | 2 +- renderdoc/os/posix/posix_process.cpp | 2 +- renderdoc/os/posix/posix_stringio.cpp | 2 +- renderdoc/os/win32/sys_win32_hooks.cpp | 2 +- renderdoc/os/win32/win32_callstack.cpp | 2 +- renderdoc/os/win32/win32_hook.cpp | 2 +- renderdoc/os/win32/win32_libentry.cpp | 2 +- renderdoc/os/win32/win32_process.cpp | 2 +- renderdoc/os/win32/win32_stringio.cpp | 2 +- renderdoc/renderdoc.vcxproj | 8 +++---- renderdoc/renderdoc.vcxproj.filters | 24 +++++++++---------- renderdoc/replay/entry_points.cpp | 2 +- renderdoc/replay/replay_controller.cpp | 2 +- renderdoc/replay/replay_output.cpp | 2 +- renderdoc/serialise/serialiser.cpp | 2 +- renderdoc/{serialise => strings}/grisu2.cpp | 0 .../{serialise => strings}/string_utils.cpp | 0 .../{serialise => strings}/string_utils.h | 0 .../{serialise => strings}/utf8printf.cpp | 0 69 files changed, 82 insertions(+), 82 deletions(-) rename renderdoc/{serialise => strings}/grisu2.cpp (100%) rename renderdoc/{serialise => strings}/string_utils.cpp (100%) rename renderdoc/{serialise => strings}/string_utils.h (100%) rename renderdoc/{serialise => strings}/utf8printf.cpp (100%) diff --git a/renderdoc/3rdparty/catch/catch.cpp b/renderdoc/3rdparty/catch/catch.cpp index b9df8c7e0..78a440a52 100644 --- a/renderdoc/3rdparty/catch/catch.cpp +++ b/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 { diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt index b31a8cbdf..bcfaf2555 100644 --- a/renderdoc/CMakeLists.txt +++ b/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 diff --git a/renderdoc/common/common.cpp b/renderdoc/common/common.cpp index 33f0753ed..3fc5b4061 100644 --- a/renderdoc/common/common.cpp +++ b/renderdoc/common/common.cpp @@ -29,7 +29,7 @@ #include #include "common/threading.h" #include "os/os_specific.h" -#include "serialise/string_utils.h" +#include "strings/string_utils.h" using std::string; diff --git a/renderdoc/core/android.cpp b/renderdoc/core/android.cpp index 0d42b79a8..28a970394 100644 --- a/renderdoc/core/android.cpp +++ b/renderdoc/core/android.cpp @@ -26,7 +26,7 @@ #include #include "api/replay/version.h" #include "core/core.h" -#include "serialise/string_utils.h" +#include "strings/string_utils.h" namespace Android { diff --git a/renderdoc/core/core.cpp b/renderdoc/core/core.cpp index 49f140511..4aeceff1a 100644 --- a/renderdoc/core/core.cpp +++ b/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 <> diff --git a/renderdoc/core/plugins.cpp b/renderdoc/core/plugins.cpp index 2d0341704..50cb1b033 100644 --- a/renderdoc/core/plugins.cpp +++ b/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) { diff --git a/renderdoc/core/remote_server.cpp b/renderdoc/core/remote_server.cpp index dafe4fec0..24ceea14d 100644 --- a/renderdoc/core/remote_server.cpp +++ b/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" diff --git a/renderdoc/driver/d3d11/d3d11_analyse.cpp b/renderdoc/driver/d3d11/d3d11_analyse.cpp index 4fd7df4fb..406a80b0b 100644 --- a/renderdoc/driver/d3d11/d3d11_analyse.cpp +++ b/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" diff --git a/renderdoc/driver/d3d11/d3d11_common.cpp b/renderdoc/driver/d3d11/d3d11_common.cpp index be12e5871..fbd872ca0 100644 --- a/renderdoc/driver/d3d11/d3d11_common.cpp +++ b/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; diff --git a/renderdoc/driver/d3d11/d3d11_context.cpp b/renderdoc/driver/d3d11/d3d11_context.cpp index 808fd2e64..0e752a96c 100644 --- a/renderdoc/driver/d3d11/d3d11_context.cpp +++ b/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); diff --git a/renderdoc/driver/d3d11/d3d11_context1_wrap.cpp b/renderdoc/driver/d3d11/d3d11_context1_wrap.cpp index bda2741f8..6e9e4adc6 100644 --- a/renderdoc/driver/d3d11/d3d11_context1_wrap.cpp +++ b/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" diff --git a/renderdoc/driver/d3d11/d3d11_context_wrap.cpp b/renderdoc/driver/d3d11/d3d11_context_wrap.cpp index 011398aaf..9c4fe8bf4 100644 --- a/renderdoc/driver/d3d11/d3d11_context_wrap.cpp +++ b/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) diff --git a/renderdoc/driver/d3d11/d3d11_debug.cpp b/renderdoc/driver/d3d11/d3d11_debug.cpp index 73d9a19dc..e7229ad7c 100644 --- a/renderdoc/driver/d3d11/d3d11_debug.cpp +++ b/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" diff --git a/renderdoc/driver/d3d11/d3d11_device.cpp b/renderdoc/driver/d3d11/d3d11_device.cpp index 7426afe65..a859d0242 100644 --- a/renderdoc/driver/d3d11/d3d11_device.cpp +++ b/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", diff --git a/renderdoc/driver/d3d11/d3d11_replay.cpp b/renderdoc/driver/d3d11/d3d11_replay.cpp index ff470aabd..3b9ed2f4d 100644 --- a/renderdoc/driver/d3d11/d3d11_replay.cpp +++ b/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" diff --git a/renderdoc/driver/d3d12/d3d12_debug.cpp b/renderdoc/driver/d3d12/d3d12_debug.cpp index bab3d24a9..10ff8856d 100644 --- a/renderdoc/driver/d3d12/d3d12_debug.cpp +++ b/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" diff --git a/renderdoc/driver/d3d12/d3d12_device.cpp b/renderdoc/driver/d3d12/d3d12_device.cpp index c3f472ff3..fa12a3818 100644 --- a/renderdoc/driver/d3d12/d3d12_device.cpp +++ b/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" diff --git a/renderdoc/driver/gl/gl_common.cpp b/renderdoc/driver/gl/gl_common.cpp index 2540b8b77..8793468c8 100644 --- a/renderdoc/driver/gl/gl_common.cpp +++ b/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] = {}; diff --git a/renderdoc/driver/gl/gl_debug.cpp b/renderdoc/driver/gl/gl_debug.cpp index 1d0a1d50a..01fc7ecec 100644 --- a/renderdoc/driver/gl/gl_debug.cpp +++ b/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" diff --git a/renderdoc/driver/gl/gl_driver.cpp b/renderdoc/driver/gl/gl_driver.cpp index e86c14879..948191303 100644 --- a/renderdoc/driver/gl/gl_driver.cpp +++ b/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" diff --git a/renderdoc/driver/gl/gl_hooks_egl.cpp b/renderdoc/driver/gl/gl_hooks_egl.cpp index 72f49e1de..cc0a2ec2b 100644 --- a/renderdoc/driver/gl/gl_hooks_egl.cpp +++ b/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); diff --git a/renderdoc/driver/gl/gl_hooks_linux.cpp b/renderdoc/driver/gl/gl_hooks_linux.cpp index b0f61caaa..58d220048 100644 --- a/renderdoc/driver/gl/gl_hooks_linux.cpp +++ b/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, diff --git a/renderdoc/driver/gl/gl_hooks_linux_shared.cpp b/renderdoc/driver/gl/gl_hooks_linux_shared.cpp index f09e9bdfa..9291fc805 100644 --- a/renderdoc/driver/gl/gl_hooks_linux_shared.cpp +++ b/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; diff --git a/renderdoc/driver/gl/gl_hooks_win32.cpp b/renderdoc/driver/gl/gl_hooks_win32.cpp index d9e7931fe..cceb6ef1b 100644 --- a/renderdoc/driver/gl/gl_hooks_win32.cpp +++ b/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" diff --git a/renderdoc/driver/gl/gl_replay.cpp b/renderdoc/driver/gl/gl_replay.cpp index b659abae0..0d5d9066a 100644 --- a/renderdoc/driver/gl/gl_replay.cpp +++ b/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" diff --git a/renderdoc/driver/gl/wrappers/gl_buffer_funcs.cpp b/renderdoc/driver/gl/wrappers/gl_buffer_funcs.cpp index ba6c20e97..5fbb88924 100644 --- a/renderdoc/driver/gl/wrappers/gl_buffer_funcs.cpp +++ b/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 diff --git a/renderdoc/driver/gl/wrappers/gl_debug_funcs.cpp b/renderdoc/driver/gl/wrappers/gl_debug_funcs.cpp index d1d1194c1..7bc3745f1 100644 --- a/renderdoc/driver/gl/wrappers/gl_debug_funcs.cpp +++ b/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) diff --git a/renderdoc/driver/gl/wrappers/gl_draw_funcs.cpp b/renderdoc/driver/gl/wrappers/gl_draw_funcs.cpp index 40d064090..5e3d326ff 100644 --- a/renderdoc/driver/gl/wrappers/gl_draw_funcs.cpp +++ b/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) diff --git a/renderdoc/driver/gl/wrappers/gl_framebuffer_funcs.cpp b/renderdoc/driver/gl/wrappers/gl_framebuffer_funcs.cpp index 0681c5049..4aca7da14 100644 --- a/renderdoc/driver/gl/wrappers/gl_framebuffer_funcs.cpp +++ b/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) { diff --git a/renderdoc/driver/gl/wrappers/gl_get_funcs.cpp b/renderdoc/driver/gl/wrappers/gl_get_funcs.cpp index 2a63125f3..186b0399c 100644 --- a/renderdoc/driver/gl/wrappers/gl_get_funcs.cpp +++ b/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() { diff --git a/renderdoc/driver/gl/wrappers/gl_interop_funcs.cpp b/renderdoc/driver/gl/wrappers/gl_interop_funcs.cpp index 54331678b..16f1b32d4 100644 --- a/renderdoc/driver/gl/wrappers/gl_interop_funcs.cpp +++ b/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) diff --git a/renderdoc/driver/gl/wrappers/gl_query_funcs.cpp b/renderdoc/driver/gl/wrappers/gl_query_funcs.cpp index 36cb300a5..ef779931f 100644 --- a/renderdoc/driver/gl/wrappers/gl_query_funcs.cpp +++ b/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) { diff --git a/renderdoc/driver/gl/wrappers/gl_sampler_funcs.cpp b/renderdoc/driver/gl/wrappers/gl_sampler_funcs.cpp index 1c79cecb3..c08bbadd0 100644 --- a/renderdoc/driver/gl/wrappers/gl_sampler_funcs.cpp +++ b/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) { diff --git a/renderdoc/driver/gl/wrappers/gl_shader_funcs.cpp b/renderdoc/driver/gl/wrappers/gl_shader_funcs.cpp index a2c7d57ab..6d9757414 100644 --- a/renderdoc/driver/gl/wrappers/gl_shader_funcs.cpp +++ b/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) { diff --git a/renderdoc/driver/gl/wrappers/gl_state_funcs.cpp b/renderdoc/driver/gl/wrappers/gl_state_funcs.cpp index 275d9c250..51172f799 100644 --- a/renderdoc/driver/gl/wrappers/gl_state_funcs.cpp +++ b/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) { diff --git a/renderdoc/driver/gl/wrappers/gl_texture_funcs.cpp b/renderdoc/driver/gl/wrappers/gl_texture_funcs.cpp index b1ecf3a51..769dcc26d 100644 --- a/renderdoc/driver/gl/wrappers/gl_texture_funcs.cpp +++ b/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 // diff --git a/renderdoc/driver/gl/wrappers/gl_uniform_funcs.cpp b/renderdoc/driver/gl/wrappers/gl_uniform_funcs.cpp index 0ffaac654..a1c51267f 100644 --- a/renderdoc/driver/gl/wrappers/gl_uniform_funcs.cpp +++ b/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) diff --git a/renderdoc/driver/ihv/amd/amd_counters.cpp b/renderdoc/driver/ihv/amd/amd_counters.cpp index cf39f17b8..7142ec491 100644 --- a/renderdoc/driver/ihv/amd/amd_counters.cpp +++ b/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) { diff --git a/renderdoc/driver/ihv/amd/amd_isa.cpp b/renderdoc/driver/ihv/amd/amd_isa.cpp index 17fc33a4e..e55373189 100644 --- a/renderdoc/driver/ihv/amd/amd_isa.cpp +++ b/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 diff --git a/renderdoc/driver/shaders/dxbc/dxbc_compile.cpp b/renderdoc/driver/shaders/dxbc/dxbc_compile.cpp index 86c314d10..e2ced3229 100644 --- a/renderdoc/driver/shaders/dxbc/dxbc_compile.cpp +++ b/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; diff --git a/renderdoc/driver/shaders/dxbc/dxbc_disassemble.cpp b/renderdoc/driver/shaders/dxbc/dxbc_disassemble.cpp index 9bed8b9cc..8c5441a55 100644 --- a/renderdoc/driver/shaders/dxbc/dxbc_disassemble.cpp +++ b/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 diff --git a/renderdoc/driver/shaders/dxbc/dxbc_inspect.cpp b/renderdoc/driver/shaders/dxbc/dxbc_inspect.cpp index 78d102df9..27dbc3a44 100644 --- a/renderdoc/driver/shaders/dxbc/dxbc_inspect.cpp +++ b/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" diff --git a/renderdoc/driver/vulkan/vk_core.cpp b/renderdoc/driver/vulkan/vk_core.cpp index 7e86b671a..e8de3dad4 100644 --- a/renderdoc/driver/vulkan/vk_core.cpp +++ b/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[] = { diff --git a/renderdoc/driver/vulkan/vk_debug.cpp b/renderdoc/driver/vulkan/vk_debug.cpp index 3cf40d225..58bf91abb 100644 --- a/renderdoc/driver/vulkan/vk_debug.cpp +++ b/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 diff --git a/renderdoc/driver/vulkan/vk_layer.cpp b/renderdoc/driver/vulkan/vk_layer.cpp index b792aad99..4ec1f3be0 100644 --- a/renderdoc/driver/vulkan/vk_layer.cpp +++ b/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" diff --git a/renderdoc/driver/vulkan/vk_linux.cpp b/renderdoc/driver/vulkan/vk_linux.cpp index 971de1539..c3e76ce80 100644 --- a/renderdoc/driver/vulkan/vk_linux.cpp +++ b/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 #include diff --git a/renderdoc/driver/vulkan/vk_replay.cpp b/renderdoc/driver/vulkan/vk_replay.cpp index fce201ba0..868e35403 100644 --- a/renderdoc/driver/vulkan/vk_replay.cpp +++ b/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" diff --git a/renderdoc/os/os_specific.cpp b/renderdoc/os/os_specific.cpp index cae7e4309..5b3d8810c 100644 --- a/renderdoc/os/os_specific.cpp +++ b/renderdoc/os/os_specific.cpp @@ -25,7 +25,7 @@ #include "os/os_specific.h" #include -#include "serialise/string_utils.h" +#include "strings/string_utils.h" using std::string; diff --git a/renderdoc/os/posix/linux/linux_hook.cpp b/renderdoc/os/posix/linux/linux_hook.cpp index 2a73e484d..b445c70bf 100644 --- a/renderdoc/os/posix/linux/linux_hook.cpp +++ b/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 diff --git a/renderdoc/os/posix/linux/linux_stringio.cpp b/renderdoc/os/posix/linux/linux_stringio.cpp index 35a5b5fd1..382407c40 100644 --- a/renderdoc/os/posix/linux/linux_stringio.cpp +++ b/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 diff --git a/renderdoc/os/posix/posix_network.cpp b/renderdoc/os/posix/posix_network.cpp index d52b272a9..2937bf95e 100644 --- a/renderdoc/os/posix/posix_network.cpp +++ b/renderdoc/os/posix/posix_network.cpp @@ -35,7 +35,7 @@ #include #include #include "os/os_specific.h" -#include "serialise/string_utils.h" +#include "strings/string_utils.h" using std::string; diff --git a/renderdoc/os/posix/posix_process.cpp b/renderdoc/os/posix/posix_process.cpp index a71e3f8c2..e4ad4c4f5 100644 --- a/renderdoc/os/posix/posix_process.cpp +++ b/renderdoc/os/posix/posix_process.cpp @@ -33,7 +33,7 @@ #include #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(); diff --git a/renderdoc/os/posix/posix_stringio.cpp b/renderdoc/os/posix/posix_stringio.cpp index 6bfbeb7b0..c216b1cb2 100644 --- a/renderdoc/os/posix/posix_stringio.cpp +++ b/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; diff --git a/renderdoc/os/win32/sys_win32_hooks.cpp b/renderdoc/os/win32/sys_win32_hooks.cpp index c72589f4f..a2d04b5fe 100644 --- a/renderdoc/os/win32/sys_win32_hooks.cpp +++ b/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" diff --git a/renderdoc/os/win32/win32_callstack.cpp b/renderdoc/os/win32/win32_callstack.cpp index 5f1df6596..87dc289f8 100644 --- a/renderdoc/os/win32/win32_callstack.cpp +++ b/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" diff --git a/renderdoc/os/win32/win32_hook.cpp b/renderdoc/os/win32/win32_hook.cpp index bec062006..889cbd85f 100644 --- a/renderdoc/os/win32/win32_hook.cpp +++ b/renderdoc/os/win32/win32_hook.cpp @@ -33,7 +33,7 @@ #include #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 diff --git a/renderdoc/os/win32/win32_libentry.cpp b/renderdoc/os/win32/win32_libentry.cpp index a374666c6..927152a0b 100644 --- a/renderdoc/os/win32/win32_libentry.cpp +++ b/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() { diff --git a/renderdoc/os/win32/win32_process.cpp b/renderdoc/os/win32/win32_process.cpp index 60d1f96a5..f29394fe1 100644 --- a/renderdoc/os/win32/win32_process.cpp +++ b/renderdoc/os/win32/win32_process.cpp @@ -31,7 +31,7 @@ #include #include "core/core.h" #include "os/os_specific.h" -#include "serialise/string_utils.h" +#include "strings/string_utils.h" using std::string; diff --git a/renderdoc/os/win32/win32_stringio.cpp b/renderdoc/os/win32/win32_stringio.cpp index 6258c5600..037db0d5d 100644 --- a/renderdoc/os/win32/win32_stringio.cpp +++ b/renderdoc/os/win32/win32_stringio.cpp @@ -32,7 +32,7 @@ #include #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; diff --git a/renderdoc/renderdoc.vcxproj b/renderdoc/renderdoc.vcxproj index 545ff037f..91ff5163c 100644 --- a/renderdoc/renderdoc.vcxproj +++ b/renderdoc/renderdoc.vcxproj @@ -189,7 +189,7 @@ - + @@ -391,10 +391,10 @@ - - - + + + diff --git a/renderdoc/renderdoc.vcxproj.filters b/renderdoc/renderdoc.vcxproj.filters index 06b259c2f..bda0360ef 100644 --- a/renderdoc/renderdoc.vcxproj.filters +++ b/renderdoc/renderdoc.vcxproj.filters @@ -219,9 +219,6 @@ 3rdparty\stb - - Common\Strings - 3rdparty\tinyexr @@ -342,6 +339,9 @@ 3rdparty\pugixml + + Common\Strings + @@ -419,15 +419,6 @@ Core - - Common\Strings - - - Common\Strings - - - Common\Strings - 3rdparty\tinyexr @@ -581,6 +572,15 @@ 3rdparty\pugixml + + Common\Strings + + + Common\Strings + + + Common\Strings + diff --git a/renderdoc/replay/entry_points.cpp b/renderdoc/replay/entry_points.cpp index 7002041f6..860a3bf37 100644 --- a/renderdoc/replay/entry_points.cpp +++ b/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. diff --git a/renderdoc/replay/replay_controller.cpp b/renderdoc/replay/replay_controller.cpp index 65a360e09..0ca0af37f 100644 --- a/renderdoc/replay/replay_controller.cpp +++ b/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) diff --git a/renderdoc/replay/replay_output.cpp b/renderdoc/replay/replay_output.cpp index aab922e21..352f19374 100644 --- a/renderdoc/replay/replay_output.cpp +++ b/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) diff --git a/renderdoc/serialise/serialiser.cpp b/renderdoc/serialise/serialiser.cpp index 9a9a180f8..6ee70009a 100644 --- a/renderdoc/serialise/serialiser.cpp +++ b/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 diff --git a/renderdoc/serialise/grisu2.cpp b/renderdoc/strings/grisu2.cpp similarity index 100% rename from renderdoc/serialise/grisu2.cpp rename to renderdoc/strings/grisu2.cpp diff --git a/renderdoc/serialise/string_utils.cpp b/renderdoc/strings/string_utils.cpp similarity index 100% rename from renderdoc/serialise/string_utils.cpp rename to renderdoc/strings/string_utils.cpp diff --git a/renderdoc/serialise/string_utils.h b/renderdoc/strings/string_utils.h similarity index 100% rename from renderdoc/serialise/string_utils.h rename to renderdoc/strings/string_utils.h diff --git a/renderdoc/serialise/utf8printf.cpp b/renderdoc/strings/utf8printf.cpp similarity index 100% rename from renderdoc/serialise/utf8printf.cpp rename to renderdoc/strings/utf8printf.cpp