From 936e6372cb691e9f24a9081c34d11a159902af6a Mon Sep 17 00:00:00 2001 From: baldurk Date: Wed, 11 Mar 2020 11:35:52 +0000 Subject: [PATCH] Remove use of 3rdparty/ prefix from includes * We instead always have 3rdparty/ in the relevant include search paths and rely on that. Each library still has its own unique base dir within 3rdparty to clarify where the include is coming from. --- qrenderdoc/Code/ScintillaSyntax.cpp | 4 ++-- qrenderdoc/Windows/CommentView.cpp | 4 ++-- qrenderdoc/Windows/ConstantBufferPreviewer.cpp | 2 +- qrenderdoc/Windows/Dialogs/CaptureDialog.cpp | 4 ++-- qrenderdoc/Windows/Dialogs/LiveCapture.cpp | 2 +- qrenderdoc/Windows/Dialogs/RemoteManager.cpp | 2 +- qrenderdoc/Windows/EventBrowser.cpp | 4 ++-- qrenderdoc/Windows/MainWindow.h | 2 +- .../Windows/PipelineState/D3D11PipelineStateViewer.cpp | 4 ++-- .../Windows/PipelineState/D3D12PipelineStateViewer.cpp | 4 ++-- .../Windows/PipelineState/GLPipelineStateViewer.cpp | 2 +- .../Windows/PipelineState/PipelineStateViewer.cpp | 2 +- .../PipelineState/VulkanPipelineStateViewer.cpp | 2 +- qrenderdoc/Windows/PixelHistoryView.cpp | 2 +- qrenderdoc/Windows/PythonShell.cpp | 4 ++-- qrenderdoc/Windows/ResourceInspector.cpp | 2 +- qrenderdoc/Windows/ShaderViewer.cpp | 8 ++++---- qrenderdoc/Windows/TextureViewer.cpp | 4 ++-- qrenderdoc/qrenderdoc.pro | 10 +++++----- qrenderdoc/qrenderdoc_local.vcxproj | 2 +- .../3rdparty/{android => aosp}/android_manifest.h | 0 renderdoc/3rdparty/tinyexr/tinyexr.cpp | 2 +- renderdoc/CMakeLists.txt | 2 +- renderdoc/android/android_manifest.cpp | 2 +- renderdoc/android/android_patch.cpp | 2 +- renderdoc/android/android_utils.cpp | 2 +- renderdoc/common/threading_tests.cpp | 2 +- renderdoc/core/bit_flag_iterator_tests.cpp | 2 +- renderdoc/core/core.cpp | 2 +- renderdoc/core/intervals_tests.cpp | 2 +- renderdoc/core/replay_proxy.cpp | 2 +- renderdoc/data/glsl_shaders.cpp | 4 ++-- renderdoc/driver/d3d11/d3d11_context1_wrap.cpp | 2 +- renderdoc/driver/d3d11/d3d11_context_wrap.cpp | 2 +- renderdoc/driver/d3d11/d3d11_resources.cpp | 2 +- renderdoc/driver/d3d11/d3d11_stringise.cpp | 2 +- renderdoc/driver/d3d12/d3d12_replay.cpp | 2 +- renderdoc/driver/d3d12/d3d12_resources.cpp | 2 +- renderdoc/driver/dxgi/dxgi_common.cpp | 2 +- renderdoc/driver/dxgi/dxgi_stringise.cpp | 2 +- renderdoc/driver/gl/gl_common.cpp | 2 +- renderdoc/driver/gl/gl_shader_refl.cpp | 2 +- renderdoc/driver/gl/wrappers/gl_buffer_funcs.cpp | 2 +- renderdoc/driver/gl/wrappers/gl_emulated.cpp | 2 +- renderdoc/driver/ihv/amd/amd_rgp.cpp | 2 +- renderdoc/driver/shaders/dxbc/dxbc_container.cpp | 2 +- renderdoc/driver/shaders/dxbc/dxbc_debug.cpp | 2 +- renderdoc/driver/shaders/dxil/llvm_decoder.cpp | 2 +- renderdoc/driver/shaders/spirv/glslang_compile.cpp | 4 ++-- renderdoc/driver/shaders/spirv/spirv_compile.cpp | 4 ++-- renderdoc/driver/shaders/spirv/spirv_editor.cpp | 2 +- renderdoc/driver/shaders/spirv/spirv_reflect.cpp | 2 +- renderdoc/driver/shaders/spirv/spirv_stringise.cpp | 2 +- renderdoc/driver/vulkan/imagestate_tests.cpp | 2 +- renderdoc/driver/vulkan/imgrefs_tests.cpp | 2 +- renderdoc/driver/vulkan/vk_common.cpp | 2 +- renderdoc/driver/vulkan/vk_core.cpp | 2 +- renderdoc/driver/vulkan/vk_rendertext.cpp | 2 +- renderdoc/driver/vulkan/vk_resources.cpp | 2 +- renderdoc/maths/formatpacking.cpp | 2 +- renderdoc/os/os_specific.cpp | 2 +- renderdoc/os/posix/android/android_hook.cpp | 4 ++-- renderdoc/os/posix/linux/linux_hook.cpp | 2 +- renderdoc/os/posix/posix_process.cpp | 2 +- renderdoc/os/win32/win32_shellext.cpp | 4 ++-- renderdoc/replay/basic_types_tests.cpp | 2 +- renderdoc/serialise/codecs/xml_codec.cpp | 4 ++-- renderdoc/serialise/comp_io_tests.cpp | 2 +- renderdoc/serialise/rdcfile.cpp | 4 ++-- renderdoc/serialise/serialiser_tests.cpp | 2 +- renderdoc/serialise/streamio_tests.cpp | 2 +- renderdoc/strings/string_utils.cpp | 2 +- renderdoc/strings/utf8printf.cpp | 2 +- renderdoccmd/CMakeLists.txt | 2 +- renderdoccmd/renderdoccmd.h | 2 +- renderdoccmd/renderdoccmd.vcxproj | 8 ++++---- 76 files changed, 100 insertions(+), 100 deletions(-) rename renderdoc/3rdparty/{android => aosp}/android_manifest.h (100%) diff --git a/qrenderdoc/Code/ScintillaSyntax.cpp b/qrenderdoc/Code/ScintillaSyntax.cpp index 70188ef55..c80b5e65c 100644 --- a/qrenderdoc/Code/ScintillaSyntax.cpp +++ b/qrenderdoc/Code/ScintillaSyntax.cpp @@ -23,9 +23,9 @@ ******************************************************************************/ #include "ScintillaSyntax.h" -#include "3rdparty/scintilla/include/SciLexer.h" -#include "3rdparty/scintilla/include/qt/ScintillaEdit.h" #include "Code/QRDUtils.h" +#include "scintilla/include/SciLexer.h" +#include "scintilla/include/qt/ScintillaEdit.h" static const char *python_keywords = "False None True and as assert break class continue def del elif else except finally for from " diff --git a/qrenderdoc/Windows/CommentView.cpp b/qrenderdoc/Windows/CommentView.cpp index 06ee317d7..be79f116b 100644 --- a/qrenderdoc/Windows/CommentView.cpp +++ b/qrenderdoc/Windows/CommentView.cpp @@ -24,9 +24,9 @@ #include "CommentView.h" #include -#include "3rdparty/scintilla/include/SciLexer.h" -#include "3rdparty/scintilla/include/qt/ScintillaEdit.h" #include "Code/ScintillaSyntax.h" +#include "scintilla/include/SciLexer.h" +#include "scintilla/include/qt/ScintillaEdit.h" #include "ui_CommentView.h" CommentView::CommentView(ICaptureContext &ctx, QWidget *parent) diff --git a/qrenderdoc/Windows/ConstantBufferPreviewer.cpp b/qrenderdoc/Windows/ConstantBufferPreviewer.cpp index 582a4465f..8d8a8c03e 100644 --- a/qrenderdoc/Windows/ConstantBufferPreviewer.cpp +++ b/qrenderdoc/Windows/ConstantBufferPreviewer.cpp @@ -25,7 +25,7 @@ #include "ConstantBufferPreviewer.h" #include #include -#include "3rdparty/toolwindowmanager/ToolWindowManager.h" +#include "toolwindowmanager/ToolWindowManager.h" #include "ui_ConstantBufferPreviewer.h" QList ConstantBufferPreviewer::m_Previews; diff --git a/qrenderdoc/Windows/Dialogs/CaptureDialog.cpp b/qrenderdoc/Windows/Dialogs/CaptureDialog.cpp index 9e405949e..74dd5f572 100644 --- a/qrenderdoc/Windows/Dialogs/CaptureDialog.cpp +++ b/qrenderdoc/Windows/Dialogs/CaptureDialog.cpp @@ -27,13 +27,13 @@ #include #include #include -#include "3rdparty/flowlayout/FlowLayout.h" -#include "3rdparty/toolwindowmanager/ToolWindowManager.h" #include "Code/QRDUtils.h" #include "Code/qprocessinfo.h" #include "Windows/Dialogs/EnvironmentEditor.h" #include "Windows/Dialogs/VirtualFileDialog.h" #include "Windows/MainWindow.h" +#include "flowlayout/FlowLayout.h" +#include "toolwindowmanager/ToolWindowManager.h" #include "LiveCapture.h" #include "ui_CaptureDialog.h" diff --git a/qrenderdoc/Windows/Dialogs/LiveCapture.cpp b/qrenderdoc/Windows/Dialogs/LiveCapture.cpp index 438912626..085c4c1b0 100644 --- a/qrenderdoc/Windows/Dialogs/LiveCapture.cpp +++ b/qrenderdoc/Windows/Dialogs/LiveCapture.cpp @@ -33,12 +33,12 @@ #include #include #include -#include "3rdparty/toolwindowmanager/ToolWindowManager.h" #include "Code/QRDUtils.h" #include "Code/Resources.h" #include "Code/qprocessinfo.h" #include "Widgets/Extended/RDLabel.h" #include "Windows/MainWindow.h" +#include "toolwindowmanager/ToolWindowManager.h" #include "ui_LiveCapture.h" static const int PIDRole = Qt::UserRole + 1; diff --git a/qrenderdoc/Windows/Dialogs/RemoteManager.cpp b/qrenderdoc/Windows/Dialogs/RemoteManager.cpp index 81d874c3e..fac2ab285 100644 --- a/qrenderdoc/Windows/Dialogs/RemoteManager.cpp +++ b/qrenderdoc/Windows/Dialogs/RemoteManager.cpp @@ -24,11 +24,11 @@ #include "RemoteManager.h" #include -#include "3rdparty/flowlayout/FlowLayout.h" #include "Code/Interface/QRDInterface.h" #include "Code/Resources.h" #include "Windows/Dialogs/LiveCapture.h" #include "Windows/MainWindow.h" +#include "flowlayout/FlowLayout.h" #include "ui_RemoteManager.h" struct RemoteConnect diff --git a/qrenderdoc/Windows/EventBrowser.cpp b/qrenderdoc/Windows/EventBrowser.cpp index 870e4aaff..3ed2c8e55 100644 --- a/qrenderdoc/Windows/EventBrowser.cpp +++ b/qrenderdoc/Windows/EventBrowser.cpp @@ -32,12 +32,12 @@ #include #include #include -#include "3rdparty/flowlayout/FlowLayout.h" -#include "3rdparty/scintilla/include/qt/ScintillaEdit.h" #include "Code/QRDUtils.h" #include "Code/Resources.h" #include "Widgets/Extended/RDHeaderView.h" #include "Widgets/Extended/RDListWidget.h" +#include "flowlayout/FlowLayout.h" +#include "scintilla/include/qt/ScintillaEdit.h" #include "ui_EventBrowser.h" struct EventItemTag diff --git a/qrenderdoc/Windows/MainWindow.h b/qrenderdoc/Windows/MainWindow.h index f805eb777..007379c91 100644 --- a/qrenderdoc/Windows/MainWindow.h +++ b/qrenderdoc/Windows/MainWindow.h @@ -29,8 +29,8 @@ #include #include #include -#include "3rdparty/toolwindowmanager/ToolWindowManager.h" #include "Code/Interface/QRDInterface.h" +#include "toolwindowmanager/ToolWindowManager.h" namespace Ui { diff --git a/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp index db4197e54..62a3dd992 100644 --- a/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp +++ b/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp @@ -28,10 +28,10 @@ #include #include #include -#include "3rdparty/flowlayout/FlowLayout.h" -#include "3rdparty/toolwindowmanager/ToolWindowManager.h" #include "Code/Resources.h" #include "Widgets/Extended/RDHeaderView.h" +#include "flowlayout/FlowLayout.h" +#include "toolwindowmanager/ToolWindowManager.h" #include "PipelineStateViewer.h" #include "ui_D3D11PipelineStateViewer.h" diff --git a/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp index 1b57107d5..0bf1d50dd 100644 --- a/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp +++ b/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp @@ -28,10 +28,10 @@ #include #include #include -#include "3rdparty/flowlayout/FlowLayout.h" -#include "3rdparty/toolwindowmanager/ToolWindowManager.h" #include "Code/Resources.h" #include "Widgets/Extended/RDHeaderView.h" +#include "flowlayout/FlowLayout.h" +#include "toolwindowmanager/ToolWindowManager.h" #include "PipelineStateViewer.h" #include "ui_D3D12PipelineStateViewer.h" diff --git a/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp index 14efdb57e..edf4f8a92 100644 --- a/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp +++ b/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp @@ -28,9 +28,9 @@ #include #include #include -#include "3rdparty/toolwindowmanager/ToolWindowManager.h" #include "Code/Resources.h" #include "Widgets/Extended/RDHeaderView.h" +#include "toolwindowmanager/ToolWindowManager.h" #include "PipelineStateViewer.h" #include "ui_GLPipelineStateViewer.h" diff --git a/qrenderdoc/Windows/PipelineState/PipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/PipelineStateViewer.cpp index 08d81401b..1507a8079 100644 --- a/qrenderdoc/Windows/PipelineState/PipelineStateViewer.cpp +++ b/qrenderdoc/Windows/PipelineState/PipelineStateViewer.cpp @@ -29,10 +29,10 @@ #include #include #include -#include "3rdparty/toolwindowmanager/ToolWindowManager.h" #include "Code/QRDUtils.h" #include "Code/Resources.h" #include "Widgets/Extended/RDLabel.h" +#include "toolwindowmanager/ToolWindowManager.h" #include "D3D11PipelineStateViewer.h" #include "D3D12PipelineStateViewer.h" #include "GLPipelineStateViewer.h" diff --git a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp index ac1d1a6e4..f1c5229f2 100644 --- a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp +++ b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp @@ -28,9 +28,9 @@ #include #include #include -#include "3rdparty/toolwindowmanager/ToolWindowManager.h" #include "Code/Resources.h" #include "Widgets/Extended/RDHeaderView.h" +#include "toolwindowmanager/ToolWindowManager.h" #include "PipelineStateViewer.h" #include "ui_VulkanPipelineStateViewer.h" diff --git a/qrenderdoc/Windows/PixelHistoryView.cpp b/qrenderdoc/Windows/PixelHistoryView.cpp index 76f9263a3..ce02ed0e3 100644 --- a/qrenderdoc/Windows/PixelHistoryView.cpp +++ b/qrenderdoc/Windows/PixelHistoryView.cpp @@ -27,7 +27,7 @@ #include #include #include -#include "3rdparty/toolwindowmanager/ToolWindowManager.h" +#include "toolwindowmanager/ToolWindowManager.h" #include "ui_PixelHistoryView.h" struct EventTag diff --git a/qrenderdoc/Windows/PythonShell.cpp b/qrenderdoc/Windows/PythonShell.cpp index 14e23d159..1e82ec91e 100644 --- a/qrenderdoc/Windows/PythonShell.cpp +++ b/qrenderdoc/Windows/PythonShell.cpp @@ -27,10 +27,10 @@ #include #include #include -#include "3rdparty/scintilla/include/SciLexer.h" -#include "3rdparty/scintilla/include/qt/ScintillaEdit.h" #include "Code/ScintillaSyntax.h" #include "Code/pyrenderdoc/PythonContext.h" +#include "scintilla/include/SciLexer.h" +#include "scintilla/include/qt/ScintillaEdit.h" #include "ui_PythonShell.h" // a forwarder that invokes onto the UI thread wherever necessary. diff --git a/qrenderdoc/Windows/ResourceInspector.cpp b/qrenderdoc/Windows/ResourceInspector.cpp index d17d0f7d8..3090fb3c8 100644 --- a/qrenderdoc/Windows/ResourceInspector.cpp +++ b/qrenderdoc/Windows/ResourceInspector.cpp @@ -26,9 +26,9 @@ #include #include #include -#include "3rdparty/toolwindowmanager/ToolWindowManagerArea.h" #include "Code/Resources.h" #include "Widgets/Extended/RDHeaderView.h" +#include "toolwindowmanager/ToolWindowManagerArea.h" #include "ui_ResourceInspector.h" static const int ResourceIdRole = Qt::UserRole; diff --git a/qrenderdoc/Windows/ShaderViewer.cpp b/qrenderdoc/Windows/ShaderViewer.cpp index 7cb697035..9b6f5937f 100644 --- a/qrenderdoc/Windows/ShaderViewer.cpp +++ b/qrenderdoc/Windows/ShaderViewer.cpp @@ -32,12 +32,12 @@ #include #include #include -#include "3rdparty/scintilla/include/SciLexer.h" -#include "3rdparty/scintilla/include/qt/ScintillaEdit.h" -#include "3rdparty/toolwindowmanager/ToolWindowManager.h" -#include "3rdparty/toolwindowmanager/ToolWindowManagerArea.h" #include "Code/ScintillaSyntax.h" #include "Widgets/FindReplace.h" +#include "scintilla/include/SciLexer.h" +#include "scintilla/include/qt/ScintillaEdit.h" +#include "toolwindowmanager/ToolWindowManager.h" +#include "toolwindowmanager/ToolWindowManagerArea.h" #include "ui_ShaderViewer.h" namespace diff --git a/qrenderdoc/Windows/TextureViewer.cpp b/qrenderdoc/Windows/TextureViewer.cpp index b8a54d1f7..d661ed0b9 100644 --- a/qrenderdoc/Windows/TextureViewer.cpp +++ b/qrenderdoc/Windows/TextureViewer.cpp @@ -35,13 +35,13 @@ #include #include #include -#include "3rdparty/flowlayout/FlowLayout.h" -#include "3rdparty/toolwindowmanager/ToolWindowManagerArea.h" #include "Code/QRDUtils.h" #include "Code/Resources.h" #include "Dialogs/TextureSaveDialog.h" #include "Widgets/ResourcePreview.h" #include "Widgets/TextureGoto.h" +#include "flowlayout/FlowLayout.h" +#include "toolwindowmanager/ToolWindowManagerArea.h" #include "ui_TextureViewer.h" float area(const QSizeF &s) diff --git a/qrenderdoc/qrenderdoc.pro b/qrenderdoc/qrenderdoc.pro index 0bcc422b5..937cae4dc 100644 --- a/qrenderdoc/qrenderdoc.pro +++ b/qrenderdoc/qrenderdoc.pro @@ -21,11 +21,11 @@ INCLUDEPATH += $$_PRO_FILE_PWD_/../renderdoc/api/replay # Allow includes relative to the root INCLUDEPATH += $$_PRO_FILE_PWD_/ -# For ToolWindowManager -INCLUDEPATH += $$_PRO_FILE_PWD_/3rdparty/toolwindowmanager -# For FlowLayout -INCLUDEPATH += $$_PRO_FILE_PWD_/3rdparty/flowlayout -# For Scintilla +# And relative to 3rdparty +INCLUDEPATH += $$_PRO_FILE_PWD_/3rdparty + +# For Scintilla source builds - we unfortunately are not able to scope these to only +# those source files INCLUDEPATH += $$_PRO_FILE_PWD_/3rdparty/scintilla/include/qt INCLUDEPATH += $$_PRO_FILE_PWD_/3rdparty/scintilla/include diff --git a/qrenderdoc/qrenderdoc_local.vcxproj b/qrenderdoc/qrenderdoc_local.vcxproj index 9b264316c..ee78d985a 100644 --- a/qrenderdoc/qrenderdoc_local.vcxproj +++ b/qrenderdoc/qrenderdoc_local.vcxproj @@ -88,7 +88,7 @@ ProgramDatabase true true - $(ProjectDir);$(IntDir)generated\;$(SolutionDir)\renderdoc\api\replay;3rdparty\python\include;3rdparty\pyside\include\PySide2;3rdparty\pyside\include\PySide2\QtCore;3rdparty\pyside\include\PySide2\QtGui;3rdparty\pyside\include\PySide2\QtWidgets;3rdparty\pyside\include\shiboken2;3rdparty\qt\include;3rdparty\qt\include\QtWidgets;3rdparty\qt\include\QtGui;3rdparty\qt\include\QtCore;3rdparty\qt\include\QtSvg;3rdparty\qt\include\QtNetwork;%(AdditionalIncludeDirectories) + $(ProjectDir);3rdparty;$(IntDir)generated\;$(SolutionDir)\renderdoc\api\replay;3rdparty\python\include;3rdparty\pyside\include\PySide2;3rdparty\pyside\include\PySide2\QtCore;3rdparty\pyside\include\PySide2\QtGui;3rdparty\pyside\include\PySide2\QtWidgets;3rdparty\pyside\include\shiboken2;3rdparty\qt\include;3rdparty\qt\include\QtWidgets;3rdparty\qt\include\QtGui;3rdparty\qt\include\QtCore;3rdparty\qt\include\QtSvg;3rdparty\qt\include\QtNetwork;%(AdditionalIncludeDirectories) /Zc:strictStrings /Zc:throwingNew %(AdditionalOptions) _WINDOWS;UNICODE;WIN32;WIN64;RENDERDOC_PLATFORM_WIN32;SCINTILLA_QT=1;MAKING_LIBRARY=1;SCI_LEXER=1;QT_NO_CAST_FROM_ASCII;QT_NO_CAST_TO_ASCII;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;QT_SVG_LIB;%(PreprocessorDefinitions) Level4 diff --git a/renderdoc/3rdparty/android/android_manifest.h b/renderdoc/3rdparty/aosp/android_manifest.h similarity index 100% rename from renderdoc/3rdparty/android/android_manifest.h rename to renderdoc/3rdparty/aosp/android_manifest.h diff --git a/renderdoc/3rdparty/tinyexr/tinyexr.cpp b/renderdoc/3rdparty/tinyexr/tinyexr.cpp index 1a47f8e63..597634e5f 100644 --- a/renderdoc/3rdparty/tinyexr/tinyexr.cpp +++ b/renderdoc/3rdparty/tinyexr/tinyexr.cpp @@ -1,7 +1,7 @@ #include #include -#include "3rdparty/miniz/miniz.h" +#include "miniz/miniz.h" #define TINYEXR_IMPLEMENTATION #include "tinyexr.h" diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt index 7d124bac9..ce154f132 100644 --- a/renderdoc/CMakeLists.txt +++ b/renderdoc/CMakeLists.txt @@ -203,7 +203,7 @@ set(sources 3rdparty/jpeg-compressor/jpgd.h 3rdparty/jpeg-compressor/jpge.cpp 3rdparty/jpeg-compressor/jpge.h - 3rdparty/android/android_manifest.h + 3rdparty/aosp/android_manifest.h 3rdparty/catch/catch.cpp 3rdparty/catch/catch.hpp 3rdparty/pugixml/pugixml.cpp diff --git a/renderdoc/android/android_manifest.cpp b/renderdoc/android/android_manifest.cpp index 8f91732a9..76d8f6304 100644 --- a/renderdoc/android/android_manifest.cpp +++ b/renderdoc/android/android_manifest.cpp @@ -22,7 +22,7 @@ * THE SOFTWARE. ******************************************************************************/ -#include "3rdparty/android/android_manifest.h" +#include "aosp/android_manifest.h" #include "core/core.h" #include "strings/string_utils.h" #include "android_utils.h" diff --git a/renderdoc/android/android_patch.cpp b/renderdoc/android/android_patch.cpp index 0e1f01a97..7499e0e9a 100644 --- a/renderdoc/android/android_patch.cpp +++ b/renderdoc/android/android_patch.cpp @@ -22,9 +22,9 @@ * THE SOFTWARE. ******************************************************************************/ -#include "3rdparty/miniz/miniz.h" #include "api/replay/version.h" #include "core/core.h" +#include "miniz/miniz.h" #include "replay/replay_driver.h" #include "strings/string_utils.h" #include "android_utils.h" diff --git a/renderdoc/android/android_utils.cpp b/renderdoc/android/android_utils.cpp index 1f38b4f4b..f880d0ff3 100644 --- a/renderdoc/android/android_utils.cpp +++ b/renderdoc/android/android_utils.cpp @@ -715,7 +715,7 @@ rdcstr DoStringise(const Android::ABI &el) #undef None -#include "3rdparty/catch/catch.hpp" +#include "catch/catch.hpp" TEST_CASE("Test that log line parsing is robust", "[android]") { diff --git a/renderdoc/common/threading_tests.cpp b/renderdoc/common/threading_tests.cpp index 4cbc5fe1a..a94da851c 100644 --- a/renderdoc/common/threading_tests.cpp +++ b/renderdoc/common/threading_tests.cpp @@ -27,7 +27,7 @@ #if ENABLED(ENABLE_UNIT_TESTS) -#include "3rdparty/catch/catch.hpp" +#include "catch/catch.hpp" static int value = 0; diff --git a/renderdoc/core/bit_flag_iterator_tests.cpp b/renderdoc/core/bit_flag_iterator_tests.cpp index 14bb4b50d..57fe2f59d 100644 --- a/renderdoc/core/bit_flag_iterator_tests.cpp +++ b/renderdoc/core/bit_flag_iterator_tests.cpp @@ -29,7 +29,7 @@ #include "api/replay/rdcarray.h" #include "bit_flag_iterator.h" -#include "3rdparty/catch/catch.hpp" +#include "catch/catch.hpp" #include diff --git a/renderdoc/core/core.cpp b/renderdoc/core/core.cpp index 88571b369..f3edde14b 100644 --- a/renderdoc/core/core.cpp +++ b/renderdoc/core/core.cpp @@ -1801,7 +1801,7 @@ void RenderDoc::RemoveFrameCapturer(void *dev, void *wnd) #undef None -#include "3rdparty/catch/catch.hpp" +#include "catch/catch.hpp" TEST_CASE("Check ResourceId tostr", "[tostr]") { diff --git a/renderdoc/core/intervals_tests.cpp b/renderdoc/core/intervals_tests.cpp index be17a5882..8d0687e3f 100644 --- a/renderdoc/core/intervals_tests.cpp +++ b/renderdoc/core/intervals_tests.cpp @@ -29,7 +29,7 @@ #include "api/replay/rdcarray.h" #include "intervals.h" -#include "3rdparty/catch/catch.hpp" +#include "catch/catch.hpp" #include diff --git a/renderdoc/core/replay_proxy.cpp b/renderdoc/core/replay_proxy.cpp index 30131ea05..25cb02b2b 100644 --- a/renderdoc/core/replay_proxy.cpp +++ b/renderdoc/core/replay_proxy.cpp @@ -25,7 +25,7 @@ #include "replay_proxy.h" #include -#include "3rdparty/lz4/lz4.h" +#include "lz4/lz4.h" #include "serialise/lz4io.h" template <> diff --git a/renderdoc/data/glsl_shaders.cpp b/renderdoc/data/glsl_shaders.cpp index 753cf00f7..78d0d91a4 100644 --- a/renderdoc/data/glsl_shaders.cpp +++ b/renderdoc/data/glsl_shaders.cpp @@ -23,10 +23,10 @@ ******************************************************************************/ #include "glsl_shaders.h" -#include "3rdparty/glslang/glslang/Public/ShaderLang.h" #include "common/common.h" #include "common/formatting.h" #include "driver/shaders/spirv/glslang_compile.h" +#include "glslang/glslang/Public/ShaderLang.h" #include "os/os_specific.h" #define GLSL_HEADERS(HEADER) \ @@ -170,7 +170,7 @@ rdcstr GenerateGLSLShader(const rdcstr &shader, ShaderType type, int version, co #if ENABLED(ENABLE_UNIT_TESTS) -#include "3rdparty/catch/catch.hpp" +#include "catch/catch.hpp" #include "driver/shaders/spirv/spirv_reflect.h" // define tests of GLSL reflection that can be re-used by both GL emulated and SPIR-V reflection diff --git a/renderdoc/driver/d3d11/d3d11_context1_wrap.cpp b/renderdoc/driver/d3d11/d3d11_context1_wrap.cpp index e7bf7dc68..1acd6a08c 100644 --- a/renderdoc/driver/d3d11/d3d11_context1_wrap.cpp +++ b/renderdoc/driver/d3d11/d3d11_context1_wrap.cpp @@ -2257,7 +2257,7 @@ SERIALISED_ID3D11CONTEXT1_FUNCTIONS(); #if ENABLED(ENABLE_UNIT_TESTS) -#include "3rdparty/catch/catch.hpp" +#include "catch/catch.hpp" static D3D11_BOX *box(UINT x, UINT w, UINT y = 0, UINT h = 1, UINT z = 0, UINT d = 1) { diff --git a/renderdoc/driver/d3d11/d3d11_context_wrap.cpp b/renderdoc/driver/d3d11/d3d11_context_wrap.cpp index 2ee2c179f..b34bc441e 100644 --- a/renderdoc/driver/d3d11/d3d11_context_wrap.cpp +++ b/renderdoc/driver/d3d11/d3d11_context_wrap.cpp @@ -24,9 +24,9 @@ ******************************************************************************/ #include "d3d11_context.h" -#include "3rdparty/tinyfiledialogs/tinyfiledialogs.h" #include "driver/dx/official/dxgi1_3.h" #include "strings/string_utils.h" +#include "tinyfiledialogs/tinyfiledialogs.h" #include "d3d11_debug.h" #include "d3d11_renderstate.h" #include "d3d11_resources.h" diff --git a/renderdoc/driver/d3d11/d3d11_resources.cpp b/renderdoc/driver/d3d11/d3d11_resources.cpp index b4caceed5..05cebda73 100644 --- a/renderdoc/driver/d3d11/d3d11_resources.cpp +++ b/renderdoc/driver/d3d11/d3d11_resources.cpp @@ -24,10 +24,10 @@ ******************************************************************************/ #include "d3d11_resources.h" -#include "3rdparty/lz4/lz4.h" #include "api/app/renderdoc_app.h" #include "driver/dxgi/dxgi_wrapped.h" #include "driver/shaders/dxbc/dxbc_reflect.h" +#include "lz4/lz4.h" #include "d3d11_context.h" #include "d3d11_renderstate.h" diff --git a/renderdoc/driver/d3d11/d3d11_stringise.cpp b/renderdoc/driver/d3d11/d3d11_stringise.cpp index b476bf0de..2110fac7b 100644 --- a/renderdoc/driver/d3d11/d3d11_stringise.cpp +++ b/renderdoc/driver/d3d11/d3d11_stringise.cpp @@ -775,7 +775,7 @@ rdcstr DoStringise(const D3D11_LOGIC_OP &el) } #if ENABLED(ENABLE_UNIT_TESTS) -#include "3rdparty/catch/catch.hpp" +#include "catch/catch.hpp" TEST_CASE("D3D11 ToStr", "[tostr][d3d]") { diff --git a/renderdoc/driver/d3d12/d3d12_replay.cpp b/renderdoc/driver/d3d12/d3d12_replay.cpp index 3cce0e6c4..29072a91c 100644 --- a/renderdoc/driver/d3d12/d3d12_replay.cpp +++ b/renderdoc/driver/d3d12/d3d12_replay.cpp @@ -3956,7 +3956,7 @@ static StructuredProcessRegistration D3D12ProcessRegistration(RDCDriver::D3D12, #undef None -#include "3rdparty/catch/catch.hpp" +#include "catch/catch.hpp" TEST_CASE("Test get_space ensures sorted nature", "[d3d12]") { diff --git a/renderdoc/driver/d3d12/d3d12_resources.cpp b/renderdoc/driver/d3d12/d3d12_resources.cpp index f05135766..b57819cdf 100644 --- a/renderdoc/driver/d3d12/d3d12_resources.cpp +++ b/renderdoc/driver/d3d12/d3d12_resources.cpp @@ -23,8 +23,8 @@ ******************************************************************************/ #include "d3d12_resources.h" -#include "3rdparty/lz4/lz4.h" #include "driver/shaders/dxbc/dxbc_reflect.h" +#include "lz4/lz4.h" #include "d3d12_command_list.h" #include "d3d12_command_queue.h" diff --git a/renderdoc/driver/dxgi/dxgi_common.cpp b/renderdoc/driver/dxgi/dxgi_common.cpp index 26b7a82de..d7f19f0be 100644 --- a/renderdoc/driver/dxgi/dxgi_common.cpp +++ b/renderdoc/driver/dxgi/dxgi_common.cpp @@ -2846,7 +2846,7 @@ void DoSerialise(SerialiserType &ser, DXGI_ADAPTER_DESC &el) INSTANTIATE_SERIALISE_TYPE(DXGI_ADAPTER_DESC); #if ENABLED(ENABLE_UNIT_TESTS) -#include "3rdparty/catch/catch.hpp" +#include "catch/catch.hpp" TEST_CASE("DXGI formats", "[format][d3d]") { diff --git a/renderdoc/driver/dxgi/dxgi_stringise.cpp b/renderdoc/driver/dxgi/dxgi_stringise.cpp index 09b992d10..0e230823f 100644 --- a/renderdoc/driver/dxgi/dxgi_stringise.cpp +++ b/renderdoc/driver/dxgi/dxgi_stringise.cpp @@ -227,7 +227,7 @@ rdcstr DoStringise(const long &el) } #if ENABLED(ENABLE_UNIT_TESTS) -#include "3rdparty/catch/catch.hpp" +#include "catch/catch.hpp" TEST_CASE("DXGI ToStr", "[tostr][d3d]") { diff --git a/renderdoc/driver/gl/gl_common.cpp b/renderdoc/driver/gl/gl_common.cpp index 77b6207e4..e6516463a 100644 --- a/renderdoc/driver/gl/gl_common.cpp +++ b/renderdoc/driver/gl/gl_common.cpp @@ -2576,7 +2576,7 @@ Topology MakePrimitiveTopology(GLenum Topo) #undef None -#include "3rdparty/catch/catch.hpp" +#include "catch/catch.hpp" TEST_CASE("GL formats", "[format][gl]") { diff --git a/renderdoc/driver/gl/gl_shader_refl.cpp b/renderdoc/driver/gl/gl_shader_refl.cpp index 44a69846e..31ef8bbb7 100644 --- a/renderdoc/driver/gl/gl_shader_refl.cpp +++ b/renderdoc/driver/gl/gl_shader_refl.cpp @@ -25,8 +25,8 @@ #include "gl_shader_refl.h" #include #include -#include "3rdparty/glslang/glslang/Public/ShaderLang.h" #include "driver/shaders/spirv/glslang_compile.h" +#include "glslang/glslang/Public/ShaderLang.h" #include "gl_driver.h" template <> diff --git a/renderdoc/driver/gl/wrappers/gl_buffer_funcs.cpp b/renderdoc/driver/gl/wrappers/gl_buffer_funcs.cpp index 7c3e77e0b..4a51bee8b 100644 --- a/renderdoc/driver/gl/wrappers/gl_buffer_funcs.cpp +++ b/renderdoc/driver/gl/wrappers/gl_buffer_funcs.cpp @@ -24,9 +24,9 @@ ******************************************************************************/ #include "../gl_driver.h" -#include "3rdparty/tinyfiledialogs/tinyfiledialogs.h" #include "common/common.h" #include "strings/string_utils.h" +#include "tinyfiledialogs/tinyfiledialogs.h" enum GLbufferbitfield { diff --git a/renderdoc/driver/gl/wrappers/gl_emulated.cpp b/renderdoc/driver/gl/wrappers/gl_emulated.cpp index 2669e18a6..32508f33a 100644 --- a/renderdoc/driver/gl/wrappers/gl_emulated.cpp +++ b/renderdoc/driver/gl/wrappers/gl_emulated.cpp @@ -3346,7 +3346,7 @@ void GLDispatchTable::DriverForEmulation(WrappedOpenGL *driver) #undef None #include "../gl_shader_refl.h" -#include "3rdparty/catch/catch.hpp" +#include "catch/catch.hpp" #include "data/glsl_shaders.h" #include "replay/replay_driver.h" #include "strings/string_utils.h" diff --git a/renderdoc/driver/ihv/amd/amd_rgp.cpp b/renderdoc/driver/ihv/amd/amd_rgp.cpp index 1ad8361d6..5e0c7d682 100644 --- a/renderdoc/driver/ihv/amd/amd_rgp.cpp +++ b/renderdoc/driver/ihv/amd/amd_rgp.cpp @@ -228,7 +228,7 @@ bool AMDRGPControl::DriverSupportsInterop() #undef None -#include "3rdparty/catch/catch.hpp" +#include "catch/catch.hpp" TEST_CASE("Check that markers are distinct for begin and end", "[amd]") { diff --git a/renderdoc/driver/shaders/dxbc/dxbc_container.cpp b/renderdoc/driver/shaders/dxbc/dxbc_container.cpp index beeee12fa..e73f7b858 100644 --- a/renderdoc/driver/shaders/dxbc/dxbc_container.cpp +++ b/renderdoc/driver/shaders/dxbc/dxbc_container.cpp @@ -1597,7 +1597,7 @@ ShaderCompileFlags EncodeFlags(const IDebugInfo *dbg) #if ENABLED(ENABLE_UNIT_TESTS) -#include "3rdparty/catch/catch.hpp" +#include "catch/catch.hpp" #if 0 diff --git a/renderdoc/driver/shaders/dxbc/dxbc_debug.cpp b/renderdoc/driver/shaders/dxbc/dxbc_debug.cpp index 1cea60fde..93660bf96 100644 --- a/renderdoc/driver/shaders/dxbc/dxbc_debug.cpp +++ b/renderdoc/driver/shaders/dxbc/dxbc_debug.cpp @@ -5343,7 +5343,7 @@ rdcarray InterpretDebugger::ContinueDebug(DXBCDebug::DebugAPIW #if ENABLED(ENABLE_UNIT_TESTS) #include -#include "3rdparty/catch/catch.hpp" +#include "catch/catch.hpp" using namespace DXBCDebug; diff --git a/renderdoc/driver/shaders/dxil/llvm_decoder.cpp b/renderdoc/driver/shaders/dxil/llvm_decoder.cpp index 58de08cc0..3a598b529 100644 --- a/renderdoc/driver/shaders/dxil/llvm_decoder.cpp +++ b/renderdoc/driver/shaders/dxil/llvm_decoder.cpp @@ -339,7 +339,7 @@ rdcstr BlockOrRecord::getString(size_t startOffset) const #if ENABLED(ENABLE_UNIT_TESTS) -#include "3rdparty/catch/catch.hpp" +#include "catch/catch.hpp" TEST_CASE("Check LLVM bitreader", "[llvm]") { diff --git a/renderdoc/driver/shaders/spirv/glslang_compile.cpp b/renderdoc/driver/shaders/spirv/glslang_compile.cpp index deed9a005..199ce9493 100644 --- a/renderdoc/driver/shaders/spirv/glslang_compile.cpp +++ b/renderdoc/driver/shaders/spirv/glslang_compile.cpp @@ -29,8 +29,8 @@ #undef min #undef max -#include "3rdparty/glslang/glslang/Include/Types.h" -#include "3rdparty/glslang/glslang/Public/ShaderLang.h" +#include "glslang/glslang/Include/Types.h" +#include "glslang/glslang/Public/ShaderLang.h" static bool glslang_inited = false; rdcarray *allocatedShaders = NULL; diff --git a/renderdoc/driver/shaders/spirv/spirv_compile.cpp b/renderdoc/driver/shaders/spirv/spirv_compile.cpp index 42c2e3efd..e85804141 100644 --- a/renderdoc/driver/shaders/spirv/spirv_compile.cpp +++ b/renderdoc/driver/shaders/spirv/spirv_compile.cpp @@ -31,8 +31,8 @@ #undef min #undef max -#include "3rdparty/glslang/SPIRV/GlslangToSpv.h" -#include "3rdparty/glslang/glslang/Public/ShaderLang.h" +#include "glslang/SPIRV/GlslangToSpv.h" +#include "glslang/glslang/Public/ShaderLang.h" rdcstr rdcspv::Compile(const rdcspv::CompilationSettings &settings, const rdcarray &sources, rdcarray &spirv) diff --git a/renderdoc/driver/shaders/spirv/spirv_editor.cpp b/renderdoc/driver/shaders/spirv/spirv_editor.cpp index c828536ee..57ad314f4 100644 --- a/renderdoc/driver/shaders/spirv/spirv_editor.cpp +++ b/renderdoc/driver/shaders/spirv/spirv_editor.cpp @@ -575,7 +575,7 @@ TYPETABLE(FunctionType, functionTypeToId); #if ENABLED(ENABLE_UNIT_TESTS) -#include "3rdparty/catch/catch.hpp" +#include "catch/catch.hpp" #include "core/core.h" #include "spirv_common.h" #include "spirv_compile.h" diff --git a/renderdoc/driver/shaders/spirv/spirv_reflect.cpp b/renderdoc/driver/shaders/spirv/spirv_reflect.cpp index 65df27aa2..09042248e 100644 --- a/renderdoc/driver/shaders/spirv/spirv_reflect.cpp +++ b/renderdoc/driver/shaders/spirv/spirv_reflect.cpp @@ -1659,7 +1659,7 @@ void Reflector::AddSignatureParameter(const bool isInput, const ShaderStage stag #if ENABLED(ENABLE_UNIT_TESTS) -#include "3rdparty/catch/catch.hpp" +#include "catch/catch.hpp" #include "data/glsl_shaders.h" #include "glslang_compile.h" diff --git a/renderdoc/driver/shaders/spirv/spirv_stringise.cpp b/renderdoc/driver/shaders/spirv/spirv_stringise.cpp index a3db63e5f..a3f93e6fd 100644 --- a/renderdoc/driver/shaders/spirv/spirv_stringise.cpp +++ b/renderdoc/driver/shaders/spirv/spirv_stringise.cpp @@ -22,7 +22,7 @@ * THE SOFTWARE. ******************************************************************************/ -#include "3rdparty/glslang/SPIRV/spirv.hpp" +#include "glslang/SPIRV/spirv.hpp" #include "api/replay/stringise.h" #include "common/common.h" diff --git a/renderdoc/driver/vulkan/imagestate_tests.cpp b/renderdoc/driver/vulkan/imagestate_tests.cpp index f8c3e36bf..7ab58f0c4 100644 --- a/renderdoc/driver/vulkan/imagestate_tests.cpp +++ b/renderdoc/driver/vulkan/imagestate_tests.cpp @@ -26,7 +26,7 @@ #if ENABLED(ENABLE_UNIT_TESTS) -#include "3rdparty/catch/catch.hpp" +#include "catch/catch.hpp" #include "vk_resources.h" diff --git a/renderdoc/driver/vulkan/imgrefs_tests.cpp b/renderdoc/driver/vulkan/imgrefs_tests.cpp index afe0afcee..5e57f1ebc 100644 --- a/renderdoc/driver/vulkan/imgrefs_tests.cpp +++ b/renderdoc/driver/vulkan/imgrefs_tests.cpp @@ -26,7 +26,7 @@ #if ENABLED(ENABLE_UNIT_TESTS) -#include "3rdparty/catch/catch.hpp" +#include "catch/catch.hpp" #include "vk_resources.h" diff --git a/renderdoc/driver/vulkan/vk_common.cpp b/renderdoc/driver/vulkan/vk_common.cpp index 6cf744647..4d561b5af 100644 --- a/renderdoc/driver/vulkan/vk_common.cpp +++ b/renderdoc/driver/vulkan/vk_common.cpp @@ -1089,7 +1089,7 @@ void DescriptorSetSlot::AddBindRefs(VulkanResourceManager *rm, VkResourceRecord #undef None -#include "3rdparty/catch/catch.hpp" +#include "catch/catch.hpp" bool operator==(const VkImageMemoryBarrier &a, const VkImageMemoryBarrier &b) { diff --git a/renderdoc/driver/vulkan/vk_core.cpp b/renderdoc/driver/vulkan/vk_core.cpp index 46d992e7e..96132c8f8 100644 --- a/renderdoc/driver/vulkan/vk_core.cpp +++ b/renderdoc/driver/vulkan/vk_core.cpp @@ -4163,7 +4163,7 @@ void WrappedVulkan::UpdateImageStates(const std::map &ds #undef None -#include "3rdparty/catch/catch.hpp" +#include "catch/catch.hpp" TEST_CASE("Validate supported extensions list", "[vulkan]") { diff --git a/renderdoc/driver/vulkan/vk_rendertext.cpp b/renderdoc/driver/vulkan/vk_rendertext.cpp index 617da4609..a30b24537 100644 --- a/renderdoc/driver/vulkan/vk_rendertext.cpp +++ b/renderdoc/driver/vulkan/vk_rendertext.cpp @@ -23,8 +23,8 @@ ******************************************************************************/ #include "vk_rendertext.h" -#include "3rdparty/stb/stb_truetype.h" #include "maths/matrix.h" +#include "stb/stb_truetype.h" #include "strings/string_utils.h" #include "vk_shader_cache.h" diff --git a/renderdoc/driver/vulkan/vk_resources.cpp b/renderdoc/driver/vulkan/vk_resources.cpp index 54223c267..51b9c4b44 100644 --- a/renderdoc/driver/vulkan/vk_resources.cpp +++ b/renderdoc/driver/vulkan/vk_resources.cpp @@ -3889,7 +3889,7 @@ FrameRefType MarkImageReferenced(std::map &imageStates, #undef None -#include "3rdparty/catch/catch.hpp" +#include "catch/catch.hpp" TEST_CASE("Vulkan formats", "[format][vulkan]") { diff --git a/renderdoc/maths/formatpacking.cpp b/renderdoc/maths/formatpacking.cpp index 5b9f79d9f..7d5735077 100644 --- a/renderdoc/maths/formatpacking.cpp +++ b/renderdoc/maths/formatpacking.cpp @@ -356,7 +356,7 @@ float ConvertComponent(const ResourceFormat &fmt, const byte *data) #undef None -#include "3rdparty/catch/catch.hpp" +#include "catch/catch.hpp" TEST_CASE("Check format conversion", "[format]") { diff --git a/renderdoc/os/os_specific.cpp b/renderdoc/os/os_specific.cpp index 17ae03ab0..1af92782b 100644 --- a/renderdoc/os/os_specific.cpp +++ b/renderdoc/os/os_specific.cpp @@ -117,7 +117,7 @@ rdcstr OSUtility::MakeMachineIdentString(uint64_t ident) #if ENABLED(ENABLE_UNIT_TESTS) -#include "3rdparty/catch/catch.hpp" +#include "catch/catch.hpp" TEST_CASE("Test OS-specific functions", "[osspecific]") { diff --git a/renderdoc/os/posix/android/android_hook.cpp b/renderdoc/os/posix/android/android_hook.cpp index ee834ede1..f68e4d03c 100644 --- a/renderdoc/os/posix/android/android_hook.cpp +++ b/renderdoc/os/posix/android/android_hook.cpp @@ -22,10 +22,10 @@ * THE SOFTWARE. ******************************************************************************/ -#include "3rdparty/plthook/plthook.h" #include "common/common.h" #include "common/threading.h" #include "hooks/hooks.h" +#include "plthook/plthook.h" #include #include @@ -556,7 +556,7 @@ void intercept_error(void *, const char *error_msg) RDCERR("intercept_error: %s", error_msg); } -#include "3rdparty/interceptor-lib/include/interceptor.h" +#include "interceptor-lib/include/interceptor.h" void PatchHookedFunctions() { diff --git a/renderdoc/os/posix/linux/linux_hook.cpp b/renderdoc/os/posix/linux/linux_hook.cpp index f58c04001..afec137aa 100644 --- a/renderdoc/os/posix/linux/linux_hook.cpp +++ b/renderdoc/os/posix/linux/linux_hook.cpp @@ -26,10 +26,10 @@ #include #include #include -#include "3rdparty/plthook/plthook.h" #include "common/threading.h" #include "hooks/hooks.h" #include "os/os_specific.h" +#include "plthook/plthook.h" #include "strings/string_utils.h" Threading::CriticalSection libLock; diff --git a/renderdoc/os/posix/posix_process.cpp b/renderdoc/os/posix/posix_process.cpp index 49d625c14..a1e4f1fa8 100644 --- a/renderdoc/os/posix/posix_process.cpp +++ b/renderdoc/os/posix/posix_process.cpp @@ -889,7 +889,7 @@ void Process::Shutdown() #if ENABLED(ENABLE_UNIT_TESTS) -#include "3rdparty/catch/catch.hpp" +#include "catch/catch.hpp" TEST_CASE("Test PID Node list handling", "[osspecific]") { diff --git a/renderdoc/os/win32/win32_shellext.cpp b/renderdoc/os/win32/win32_shellext.cpp index 758bf0c21..d677071fe 100644 --- a/renderdoc/os/win32/win32_shellext.cpp +++ b/renderdoc/os/win32/win32_shellext.cpp @@ -29,12 +29,12 @@ #include #include -#include "3rdparty/lz4/lz4.h" -#include "3rdparty/stb/stb_image_resize.h" #include "common/common.h" #include "core/core.h" #include "jpeg-compressor/jpgd.h" +#include "lz4/lz4.h" #include "serialise/rdcfile.h" +#include "stb/stb_image_resize.h" // {5D6BF029-A6BA-417A-8523-120492B1DCE3} static const GUID CLSID_RDCThumbnailProvider = {0x5d6bf029, diff --git a/renderdoc/replay/basic_types_tests.cpp b/renderdoc/replay/basic_types_tests.cpp index 2a50eadd4..36680d61d 100644 --- a/renderdoc/replay/basic_types_tests.cpp +++ b/renderdoc/replay/basic_types_tests.cpp @@ -33,7 +33,7 @@ #include "common/timing.h" #include "os/os_specific.h" -#include "3rdparty/catch/catch.hpp" +#include "catch/catch.hpp" static volatile int32_t constructor = 0; static volatile int32_t moveConstructor = 0; diff --git a/renderdoc/serialise/codecs/xml_codec.cpp b/renderdoc/serialise/codecs/xml_codec.cpp index 265df8870..058fb78a2 100644 --- a/renderdoc/serialise/codecs/xml_codec.cpp +++ b/renderdoc/serialise/codecs/xml_codec.cpp @@ -29,8 +29,8 @@ #include "serialise/rdcfile.h" #include "strings/string_utils.h" -#include "3rdparty/miniz/miniz.h" -#include "3rdparty/pugixml/pugixml.hpp" +#include "miniz/miniz.h" +#include "pugixml/pugixml.hpp" struct ThumbTypeAndData { diff --git a/renderdoc/serialise/comp_io_tests.cpp b/renderdoc/serialise/comp_io_tests.cpp index 41a0d8179..1fa9757ac 100644 --- a/renderdoc/serialise/comp_io_tests.cpp +++ b/renderdoc/serialise/comp_io_tests.cpp @@ -28,7 +28,7 @@ #if ENABLED(ENABLE_UNIT_TESTS) -#include "3rdparty/catch/catch.hpp" +#include "catch/catch.hpp" TEST_CASE("Test LZ4 compression/decompression", "[streamio][lz4]") { diff --git a/renderdoc/serialise/rdcfile.cpp b/renderdoc/serialise/rdcfile.cpp index 34c460f72..84932546b 100644 --- a/renderdoc/serialise/rdcfile.cpp +++ b/renderdoc/serialise/rdcfile.cpp @@ -24,11 +24,11 @@ #include "rdcfile.h" #include -#include "3rdparty/jpeg-compressor/jpge.h" -#include "3rdparty/stb/stb_image.h" #include "api/replay/version.h" #include "common/dds_readwrite.h" #include "common/formatting.h" +#include "jpeg-compressor/jpge.h" +#include "stb/stb_image.h" #include "lz4io.h" #include "zstdio.h" diff --git a/renderdoc/serialise/serialiser_tests.cpp b/renderdoc/serialise/serialiser_tests.cpp index a8c860aeb..281e46a50 100644 --- a/renderdoc/serialise/serialiser_tests.cpp +++ b/renderdoc/serialise/serialiser_tests.cpp @@ -26,7 +26,7 @@ #if ENABLED(ENABLE_UNIT_TESTS) -#include "3rdparty/catch/catch.hpp" +#include "catch/catch.hpp" void WriteAllBasicTypes(WriteSerialiser &ser) { diff --git a/renderdoc/serialise/streamio_tests.cpp b/renderdoc/serialise/streamio_tests.cpp index 0b42132c3..8b87cf32c 100644 --- a/renderdoc/serialise/streamio_tests.cpp +++ b/renderdoc/serialise/streamio_tests.cpp @@ -27,7 +27,7 @@ #if ENABLED(ENABLE_UNIT_TESTS) -#include "3rdparty/catch/catch.hpp" +#include "catch/catch.hpp" TEST_CASE("Test basic stream I/O operations", "[streamio]") { diff --git a/renderdoc/strings/string_utils.cpp b/renderdoc/strings/string_utils.cpp index 39b9ffba4..d5509c838 100644 --- a/renderdoc/strings/string_utils.cpp +++ b/renderdoc/strings/string_utils.cpp @@ -187,7 +187,7 @@ void merge(const rdcarray &in, rdcstr &out, const char sep) } #if ENABLED(ENABLE_UNIT_TESTS) -#include "3rdparty/catch/catch.hpp" +#include "catch/catch.hpp" TEST_CASE("String hashing", "[string]") { diff --git a/renderdoc/strings/utf8printf.cpp b/renderdoc/strings/utf8printf.cpp index 3a820c087..aa935179f 100644 --- a/renderdoc/strings/utf8printf.cpp +++ b/renderdoc/strings/utf8printf.cpp @@ -1467,7 +1467,7 @@ int utf8printf(char *str, size_t bufSize, const char *fmt, ...) #if ENABLED(ENABLE_UNIT_TESTS) -#include "3rdparty/catch/catch.hpp" +#include "catch/catch.hpp" #include "common/formatting.h" TEST_CASE("utf8printf buffer sizing", "[utf8printf]") diff --git a/renderdoccmd/CMakeLists.txt b/renderdoccmd/CMakeLists.txt index 9e64f0bed..2b3ab02e4 100644 --- a/renderdoccmd/CMakeLists.txt +++ b/renderdoccmd/CMakeLists.txt @@ -1,5 +1,5 @@ set(sources renderdoccmd.cpp) -set(includes PRIVATE ${CMAKE_SOURCE_DIR}/renderdoc/api) +set(includes PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty ${CMAKE_SOURCE_DIR}/renderdoc/api) set(libraries PRIVATE renderdoc) if(PythonLibs_FOUND) diff --git a/renderdoccmd/renderdoccmd.h b/renderdoccmd/renderdoccmd.h index 31b057123..74f15af73 100644 --- a/renderdoccmd/renderdoccmd.h +++ b/renderdoccmd/renderdoccmd.h @@ -25,7 +25,7 @@ #pragma once #include -#include "3rdparty/cmdline/cmdline.h" +#include "cmdline/cmdline.h" struct Command { diff --git a/renderdoccmd/renderdoccmd.vcxproj b/renderdoccmd/renderdoccmd.vcxproj index 0731c6abd..11fcd703c 100644 --- a/renderdoccmd/renderdoccmd.vcxproj +++ b/renderdoccmd/renderdoccmd.vcxproj @@ -101,7 +101,7 @@ Level3 Disabled WIN32;_CRT_SECURE_NO_WARNINGS;RENDERDOC_PLATFORM_WIN32;NDEBUG;_CONSOLE;PYTHON_VERSION_MINOR=6;%(PreprocessorDefinitions) - $(SolutionDir)renderdocshim\;$(SolutionDir)renderdoc\api\;$(SolutionDir)renderdoc\api\replay;$(SolutionDir)renderdoc\3rdparty\ + $(SolutionDir)renderdocshim\;$(SolutionDir)renderdoc\api\;$(SolutionDir)renderdoc\api\replay;$(SolutionDir)renderdoccmd\3rdparty\;$(SolutionDir)renderdoc\3rdparty\ MultiThreadedDLL true ProgramDatabase @@ -123,7 +123,7 @@ Level3 Disabled WIN32;_CRT_SECURE_NO_WARNINGS;WIN64;RENDERDOC_PLATFORM_WIN32;NDEBUG;_CONSOLE;PYTHON_VERSION_MINOR=6;%(PreprocessorDefinitions) - $(SolutionDir)renderdocshim\;$(SolutionDir)renderdoc\api\;$(SolutionDir)renderdoc\api\replay;$(SolutionDir)renderdoc\3rdparty\ + $(SolutionDir)renderdocshim\;$(SolutionDir)renderdoc\api\;$(SolutionDir)renderdoc\api\replay;$(SolutionDir)renderdoccmd\3rdparty\;$(SolutionDir)renderdoc\3rdparty\ MultiThreadedDLL true ProgramDatabase @@ -146,7 +146,7 @@ true true WIN32;_CRT_SECURE_NO_WARNINGS;RENDERDOC_PLATFORM_WIN32;NDEBUG;RELEASE;_CONSOLE;PYTHON_VERSION_MINOR=6;%(PreprocessorDefinitions) - $(SolutionDir)renderdocshim\;$(SolutionDir)renderdoc\api\;$(SolutionDir)renderdoc\api\replay;$(SolutionDir)renderdoc\3rdparty\ + $(SolutionDir)renderdocshim\;$(SolutionDir)renderdoc\api\;$(SolutionDir)renderdoc\api\replay;$(SolutionDir)renderdoccmd\3rdparty\;$(SolutionDir)renderdoc\3rdparty\ true @@ -169,7 +169,7 @@ true true WIN32;_CRT_SECURE_NO_WARNINGS;WIN64;RENDERDOC_PLATFORM_WIN32;NDEBUG;RELEASE;_CONSOLE;PYTHON_VERSION_MINOR=6;%(PreprocessorDefinitions) - $(SolutionDir)renderdocshim\;$(SolutionDir)renderdoc\api\;$(SolutionDir)renderdoc\api\replay;$(SolutionDir)renderdoc\3rdparty\ + $(SolutionDir)renderdocshim\;$(SolutionDir)renderdoc\api\;$(SolutionDir)renderdoc\api\replay;$(SolutionDir)renderdoccmd\3rdparty\;$(SolutionDir)renderdoc\3rdparty\ true