diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt index eff5073e..b0e3b3cb 100644 --- a/engine/CMakeLists.txt +++ b/engine/CMakeLists.txt @@ -388,16 +388,16 @@ add_library(XCEngine STATIC ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/Shader/Shader.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/Shader/ShaderLoader.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/Shader/ShaderIR.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/Shader/ShaderFileUtils.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/Shader/ShaderFileUtils.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/Shader/ShaderRuntimeBuildUtils.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/Shader/ShaderRuntimeBuildUtils.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/Shader/ShaderAuthoringLoader.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/Shader/ShaderAuthoringLoader.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/Shader/ShaderManifestLoader.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/Shader/ShaderManifestLoader.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/Shader/ShaderArtifactLoader.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/Shader/ShaderArtifactLoader.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/Shader/Detail/ShaderFileUtils.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/Shader/Detail/ShaderFileUtils.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/Shader/Detail/ShaderRuntimeBuildUtils.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/Shader/Detail/ShaderRuntimeBuildUtils.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/Shader/Detail/ShaderAuthoringLoader.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/Shader/Detail/ShaderAuthoringLoader.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/Shader/Detail/ShaderManifestLoader.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/Shader/Detail/ShaderManifestLoader.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/Shader/Detail/ShaderArtifactLoader.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/Shader/Detail/ShaderArtifactLoader.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/Shader/ShaderSourceUtils.h ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/Shader/ShaderSourceUtils.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/Shader/ShaderAuthoringParser.h diff --git a/engine/src/Resources/Shader/ShaderArtifactLoader.cpp b/engine/src/Resources/Shader/Detail/ShaderArtifactLoader.cpp similarity index 100% rename from engine/src/Resources/Shader/ShaderArtifactLoader.cpp rename to engine/src/Resources/Shader/Detail/ShaderArtifactLoader.cpp diff --git a/engine/src/Resources/Shader/ShaderArtifactLoader.h b/engine/src/Resources/Shader/Detail/ShaderArtifactLoader.h similarity index 100% rename from engine/src/Resources/Shader/ShaderArtifactLoader.h rename to engine/src/Resources/Shader/Detail/ShaderArtifactLoader.h diff --git a/engine/src/Resources/Shader/ShaderAuthoringLoader.cpp b/engine/src/Resources/Shader/Detail/ShaderAuthoringLoader.cpp similarity index 98% rename from engine/src/Resources/Shader/ShaderAuthoringLoader.cpp rename to engine/src/Resources/Shader/Detail/ShaderAuthoringLoader.cpp index 545c74b2..88b180ef 100644 --- a/engine/src/Resources/Shader/ShaderAuthoringLoader.cpp +++ b/engine/src/Resources/Shader/Detail/ShaderAuthoringLoader.cpp @@ -1,8 +1,8 @@ #include "ShaderAuthoringLoader.h" -#include "ShaderAuthoringParser.h" +#include "../ShaderAuthoringParser.h" #include "ShaderRuntimeBuildUtils.h" -#include "ShaderSourceUtils.h" +#include "../ShaderSourceUtils.h" #include diff --git a/engine/src/Resources/Shader/ShaderAuthoringLoader.h b/engine/src/Resources/Shader/Detail/ShaderAuthoringLoader.h similarity index 100% rename from engine/src/Resources/Shader/ShaderAuthoringLoader.h rename to engine/src/Resources/Shader/Detail/ShaderAuthoringLoader.h diff --git a/engine/src/Resources/Shader/ShaderFileUtils.cpp b/engine/src/Resources/Shader/Detail/ShaderFileUtils.cpp similarity index 100% rename from engine/src/Resources/Shader/ShaderFileUtils.cpp rename to engine/src/Resources/Shader/Detail/ShaderFileUtils.cpp diff --git a/engine/src/Resources/Shader/ShaderFileUtils.h b/engine/src/Resources/Shader/Detail/ShaderFileUtils.h similarity index 100% rename from engine/src/Resources/Shader/ShaderFileUtils.h rename to engine/src/Resources/Shader/Detail/ShaderFileUtils.h diff --git a/engine/src/Resources/Shader/ShaderManifestLoader.cpp b/engine/src/Resources/Shader/Detail/ShaderManifestLoader.cpp similarity index 99% rename from engine/src/Resources/Shader/ShaderManifestLoader.cpp rename to engine/src/Resources/Shader/Detail/ShaderManifestLoader.cpp index 15d6da06..1f3f2a33 100644 --- a/engine/src/Resources/Shader/ShaderManifestLoader.cpp +++ b/engine/src/Resources/Shader/Detail/ShaderManifestLoader.cpp @@ -2,7 +2,7 @@ #include "ShaderFileUtils.h" #include "ShaderRuntimeBuildUtils.h" -#include "ShaderSourceUtils.h" +#include "../ShaderSourceUtils.h" #include #include diff --git a/engine/src/Resources/Shader/ShaderManifestLoader.h b/engine/src/Resources/Shader/Detail/ShaderManifestLoader.h similarity index 100% rename from engine/src/Resources/Shader/ShaderManifestLoader.h rename to engine/src/Resources/Shader/Detail/ShaderManifestLoader.h diff --git a/engine/src/Resources/Shader/ShaderRuntimeBuildUtils.cpp b/engine/src/Resources/Shader/Detail/ShaderRuntimeBuildUtils.cpp similarity index 99% rename from engine/src/Resources/Shader/ShaderRuntimeBuildUtils.cpp rename to engine/src/Resources/Shader/Detail/ShaderRuntimeBuildUtils.cpp index 61c015b4..f2f9c23e 100644 --- a/engine/src/Resources/Shader/ShaderRuntimeBuildUtils.cpp +++ b/engine/src/Resources/Shader/Detail/ShaderRuntimeBuildUtils.cpp @@ -1,8 +1,8 @@ #include "ShaderRuntimeBuildUtils.h" -#include "ShaderAuthoringParser.h" +#include "../ShaderAuthoringParser.h" #include "ShaderFileUtils.h" -#include "ShaderSourceUtils.h" +#include "../ShaderSourceUtils.h" #include diff --git a/engine/src/Resources/Shader/ShaderRuntimeBuildUtils.h b/engine/src/Resources/Shader/Detail/ShaderRuntimeBuildUtils.h similarity index 96% rename from engine/src/Resources/Shader/ShaderRuntimeBuildUtils.h rename to engine/src/Resources/Shader/Detail/ShaderRuntimeBuildUtils.h index c1b8ba95..7c92893b 100644 --- a/engine/src/Resources/Shader/ShaderRuntimeBuildUtils.h +++ b/engine/src/Resources/Shader/Detail/ShaderRuntimeBuildUtils.h @@ -1,6 +1,6 @@ #pragma once -#include "ShaderIR.h" +#include "../ShaderIR.h" #include #include diff --git a/engine/src/Resources/Shader/ShaderLoader.cpp b/engine/src/Resources/Shader/ShaderLoader.cpp index 4f1fda76..50b0aa18 100644 --- a/engine/src/Resources/Shader/ShaderLoader.cpp +++ b/engine/src/Resources/Shader/ShaderLoader.cpp @@ -1,11 +1,11 @@ #include -#include "ShaderArtifactLoader.h" -#include "ShaderAuthoringLoader.h" +#include "Detail/ShaderArtifactLoader.h" +#include "Detail/ShaderAuthoringLoader.h" #include "ShaderAuthoringParser.h" -#include "ShaderFileUtils.h" -#include "ShaderManifestLoader.h" -#include "ShaderRuntimeBuildUtils.h" +#include "Detail/ShaderFileUtils.h" +#include "Detail/ShaderManifestLoader.h" +#include "Detail/ShaderRuntimeBuildUtils.h" #include #include