Move all "binding" files to separate directories.

Flone-dnb · Oct 20, 2024 · 8d652f5 · 8d652f5
1 parent 1dc862f
commit 8d652f5
Show file tree

Hide file tree

Showing 36 changed files with 245 additions and 236 deletions.
diff --git a/src/engine_lib/CMakeLists.txt b/src/engine_lib/CMakeLists.txt
@@ -38,10 +38,10 @@ set(PROJECT_WIN32_SOURCES
     private/shader/hlsl/HlslShader.cpp
     private/shader/hlsl/RootSignatureGenerator.h
     private/shader/hlsl/RootSignatureGenerator.cpp
-    private/shader/hlsl/resources/HlslShaderTextureResourceBinding.h
-    private/shader/hlsl/resources/HlslShaderTextureResourceBinding.cpp
-    private/shader/hlsl/resources/HlslGlobalShaderResourceBinding.cpp
-    private/shader/hlsl/resources/HlslGlobalShaderResourceBinding.h
+    private/shader/hlsl/resources/binding/texture/HlslShaderTextureResourceBinding.h
+    private/shader/hlsl/resources/binding/texture/HlslShaderTextureResourceBinding.cpp
+    private/shader/hlsl/resources/binding/global/HlslGlobalShaderResourceBinding.cpp
+    private/shader/hlsl/resources/binding/global/HlslGlobalShaderResourceBinding.h
     private/shader/hlsl/HlslComputeShaderInterface.cpp
     private/shader/hlsl/HlslComputeShaderInterface.h
     private/shader/hlsl/formats/HlslVertexFormatDescription.h
@@ -160,12 +160,12 @@ set(PROJECT_SOURCES
     private/shader/general/resources/cpuwrite/DynamicCpuWriteShaderResourceArray.h
     private/shader/general/resources/cpuwrite/DynamicCpuWriteShaderResourceArrayManager.cpp
     private/shader/general/resources/cpuwrite/DynamicCpuWriteShaderResourceArrayManager.h
-    private/shader/general/resources/cpuwrite/ShaderCpuWriteResourceBinding.cpp
-    private/shader/general/resources/cpuwrite/ShaderCpuWriteResourceBinding.h
-    private/shader/general/resources/GlobalShaderResourceBinding.cpp
-    private/shader/general/resources/GlobalShaderResourceBinding.h
-    private/shader/general/resources/GlobalShaderResourceBindingManager.cpp
-    private/shader/general/resources/GlobalShaderResourceBindingManager.h
+    private/shader/general/resources/binding/cpuwrite/ShaderCpuWriteResourceBinding.cpp
+    private/shader/general/resources/binding/cpuwrite/ShaderCpuWriteResourceBinding.h
+    private/shader/general/resources/binding/global/GlobalShaderResourceBinding.cpp
+    private/shader/general/resources/binding/global/GlobalShaderResourceBinding.h
+    private/shader/general/resources/binding/global/GlobalShaderResourceBindingManager.cpp
+    private/shader/general/resources/binding/global/GlobalShaderResourceBindingManager.h
     private/shader/glsl/formats/GlslVertexFormatDescription.h
     private/shader/glsl/formats/GlslVertexFormatDescription.cpp
     private/shader/glsl/formats/MeshNodeGlslVertexFormatDescription.cpp
@@ -184,17 +184,17 @@ set(PROJECT_SOURCES
     private/shader/general/EngineShaderNames.hpp
     private/shader/general/EngineShaders.hpp
     private/shader/general/EngineShaderConstantMacros.hpp
-    private/shader/general/resources/ShaderResourceBinding.h
-    private/shader/general/resources/ShaderResourceBinding.cpp
+    private/shader/general/resources/binding/ShaderResourceBinding.h
+    private/shader/general/resources/binding/ShaderResourceBinding.cpp
     private/shader/general/resources/ShaderArrayIndexManager.h
     private/shader/general/resources/ShaderArrayIndexManager.cpp
     private/shader/general/resources/ShaderLightsInFrustumSingleType.hpp
     private/shader/glsl/GlslShader.h
     private/shader/glsl/GlslShader.cpp
-    private/shader/glsl/resources/GlslShaderTextureResourceBinding.h
-    private/shader/glsl/resources/GlslShaderTextureResourceBinding.cpp
-    private/shader/glsl/resources/GlslGlobalShaderResourceBinding.cpp
-    private/shader/glsl/resources/GlslGlobalShaderResourceBinding.h
+    private/shader/glsl/resources/binding/texture/GlslShaderTextureResourceBinding.h
+    private/shader/glsl/resources/binding/texture/GlslShaderTextureResourceBinding.cpp
+    private/shader/glsl/resources/binding/global/GlslGlobalShaderResourceBinding.cpp
+    private/shader/glsl/resources/binding/global/GlslGlobalShaderResourceBinding.h
     private/shader/glsl/DescriptorSetLayoutGenerator.h
     private/shader/glsl/DescriptorSetLayoutGenerator.cpp
     private/shader/glsl/GlslComputeShaderInterface.cpp
@@ -237,14 +237,14 @@ set(PROJECT_SOURCES
     private/shader/general/ShaderMacro.h
     private/shader/general/ShaderMacro.cpp
     private/shader/general/ShaderFilesystemPaths.hpp
-    private/shader/general/resources/cpuwrite/ShaderCpuWriteResourceBindingManager.cpp
-    private/shader/general/resources/cpuwrite/ShaderCpuWriteResourceBindingManager.h
-    private/shader/general/resources/cpuwrite/ShaderCpuWriteResourceBindingUniquePtr.cpp
-    private/shader/general/resources/cpuwrite/ShaderCpuWriteResourceBindingUniquePtr.h
-    private/shader/general/resources/texture/ShaderTextureResourceBindingManager.cpp
-    private/shader/general/resources/texture/ShaderTextureResourceBindingManager.h
-    private/shader/general/resources/texture/ShaderTextureResourceBindingUniquePtr.cpp
-    private/shader/general/resources/texture/ShaderTextureResourceBindingUniquePtr.h
+    private/shader/general/resources/binding/cpuwrite/ShaderCpuWriteResourceBindingManager.cpp
+    private/shader/general/resources/binding/cpuwrite/ShaderCpuWriteResourceBindingManager.h
+    private/shader/general/resources/binding/cpuwrite/ShaderCpuWriteResourceBindingUniquePtr.cpp
+    private/shader/general/resources/binding/cpuwrite/ShaderCpuWriteResourceBindingUniquePtr.h
+    private/shader/general/resources/binding/texture/ShaderTextureResourceBindingManager.cpp
+    private/shader/general/resources/binding/texture/ShaderTextureResourceBindingManager.h
+    private/shader/general/resources/binding/texture/ShaderTextureResourceBindingUniquePtr.cpp
+    private/shader/general/resources/binding/texture/ShaderTextureResourceBindingUniquePtr.h
     public/shader/VulkanAlignmentConstants.hpp
     public/misc/ProjectPaths.h
     private/misc/ProjectPaths.cpp

diff --git a/src/engine_lib/private/game/nodes/MeshNode.cpp b/src/engine_lib/private/game/nodes/MeshNode.cpp
@@ -8,8 +8,8 @@
 #include "game/Window.h"
 #include "render/Renderer.h"
 #include "render/general/resources/GpuResourceManager.h"
-#include "shader/general/resources/cpuwrite/ShaderCpuWriteResourceBindingManager.h"
-#include "shader/general/resources/texture/ShaderTextureResourceBindingManager.h"
+#include "shader/general/resources/binding/cpuwrite/ShaderCpuWriteResourceBindingManager.h"
+#include "shader/general/resources/binding/texture/ShaderTextureResourceBindingManager.h"
 #include "shader/general/EngineShaderNames.hpp"
 #include "misc/PrimitiveMeshGenerator.h"
 
@@ -580,7 +580,8 @@ namespace ne {
         // keep spawn locked
 
         // Make sure there is no resource with this name.
-        auto it = mtxGpuResources.second.shaderResources.shaderCpuWriteResourceBindings.find(sShaderResourceName);
+        auto it =
+            mtxGpuResources.second.shaderResources.shaderCpuWriteResourceBindings.find(sShaderResourceName);
         if (it != mtxGpuResources.second.shaderResources.shaderCpuWriteResourceBindings.end()) [[unlikely]] {
             Error error(std::format(
                 "mesh node \"{}\" already has a shader CPU write resource with the name \"{}\"",
@@ -735,7 +736,8 @@ namespace ne {
         // keep spawn locked
 
         // Make sure there is a resource with this name.
-        auto it = mtxGpuResources.second.shaderResources.shaderCpuWriteResourceBindings.find(sShaderResourceName);
+        auto it =
+            mtxGpuResources.second.shaderResources.shaderCpuWriteResourceBindings.find(sShaderResourceName);
         if (it == mtxGpuResources.second.shaderResources.shaderCpuWriteResourceBindings.end()) {
             return; // silently exit, this is not an error
         }
@@ -859,8 +861,9 @@ namespace ne {
             }
 
             // Find mesh data shader resource.
-            const auto meshDataIt = mtxGpuResources.second.shaderResources.shaderCpuWriteResourceBindings.find(
-                sMeshShaderConstantBufferName);
+            const auto meshDataIt =
+                mtxGpuResources.second.shaderResources.shaderCpuWriteResourceBindings.find(
+                    sMeshShaderConstantBufferName);
             if (meshDataIt == mtxGpuResources.second.shaderResources.shaderCpuWriteResourceBindings.end())
                 [[unlikely]] {
                 Error error(

diff --git a/src/engine_lib/private/material/Material.cpp b/src/engine_lib/private/material/Material.cpp
@@ -9,8 +9,8 @@
 #include "io/Logger.h"
 #include "game/nodes/MeshNode.h"
 #include "render/general/resources/GpuResourceManager.h"
-#include "shader/general/resources/cpuwrite/ShaderCpuWriteResourceBindingManager.h"
-#include "shader/general/resources/texture/ShaderTextureResourceBindingManager.h"
+#include "shader/general/resources/binding/cpuwrite/ShaderCpuWriteResourceBindingManager.h"
+#include "shader/general/resources/binding/texture/ShaderTextureResourceBindingManager.h"
 #include "shader/ShaderManager.h"
 #include "render/general/pipeline/PipelineManager.h"
 #include "material/TextureManager.h"

diff --git a/src/engine_lib/private/render/directx/DirectXRenderer.cpp b/src/engine_lib/private/render/directx/DirectXRenderer.cpp
@@ -17,11 +17,11 @@
 #include "material/Material.h"
 #include "game/nodes/MeshNode.h"
 #include "shader/hlsl/RootSignatureGenerator.h"
-#include "shader/general/resources/cpuwrite/ShaderCpuWriteResourceBinding.h"
+#include "shader/general/resources/binding/cpuwrite/ShaderCpuWriteResourceBinding.h"
 #include "render/general/resources/frame/FrameResourceManager.h"
 #include "game/camera/CameraProperties.h"
 #include "game/camera/CameraManager.h"
-#include "shader/hlsl/resources/HlslShaderTextureResourceBinding.h"
+#include "shader/hlsl/resources/binding/texture/HlslShaderTextureResourceBinding.h"
 #include "render/directx/resources/DirectXFrameResource.h"
 #include "render/directx/resources/shadow/DirectXShadowMapArrayIndexManager.h"
 #include "shader/hlsl/HlslComputeShaderInterface.h"
@@ -1001,12 +1001,11 @@ namespace ne {
 
                             // Find and bind mesh data resource since only it is used in vertex shader.
                             const auto& meshDataIt =
-                                pMtxMeshGpuResources->second.shaderResources.shaderCpuWriteResourceBindings.find(
-                                    MeshNode::getMeshShaderConstantBufferName());
+                                pMtxMeshGpuResources->second.shaderResources.shaderCpuWriteResourceBindings
+                                    .find(MeshNode::getMeshShaderConstantBufferName());
 #if defined(DEBUG)
-                            if (meshDataIt ==
-                                pMtxMeshGpuResources->second.shaderResources.shaderCpuWriteResourceBindings.end())
-                                [[unlikely]] {
+                            if (meshDataIt == pMtxMeshGpuResources->second.shaderResources
+                                                  .shaderCpuWriteResourceBindings.end()) [[unlikely]] {
                                 Error error(std::format(
                                     "expected to find \"{}\" shader resource",
                                     MeshNode::getMeshShaderConstantBufferName()));

diff --git a/src/engine_lib/private/render/general/Renderer.cpp b/src/engine_lib/private/render/general/Renderer.cpp
@@ -19,9 +19,9 @@
 #include "render/general/resources/GpuResourceManager.h"
 #include "shader/general/resources/LightingShaderResourceManager.h"
 #include "shader/general/resources/ShaderLightsInFrustumSingleType.hpp"
-#include "shader/general/resources/cpuwrite/ShaderCpuWriteResourceBindingManager.h"
-#include "shader/general/resources/texture/ShaderTextureResourceBindingManager.h"
-#include "shader/general/resources/GlobalShaderResourceBindingManager.h"
+#include "shader/general/resources/binding/cpuwrite/ShaderCpuWriteResourceBindingManager.h"
+#include "shader/general/resources/binding/texture/ShaderTextureResourceBindingManager.h"
+#include "shader/general/resources/binding/global/GlobalShaderResourceBindingManager.h"
 #include "shader/general/ShaderMacro.h"
 #include "shader/ShaderManager.h"
 #include "game/nodes/MeshNode.h"
@@ -880,8 +880,8 @@ namespace ne {
             new ShaderCpuWriteResourceBindingManager(this));
 
         // Create shader texture resource manager.
-        pShaderTextureResourceManager =
-            std::unique_ptr<ShaderTextureResourceBindingManager>(new ShaderTextureResourceBindingManager(this));
+        pShaderTextureResourceManager = std::unique_ptr<ShaderTextureResourceBindingManager>(
+            new ShaderTextureResourceBindingManager(this));
 
         // Create lighting shader resource manager.
         pLightingShaderResourceManager = LightingShaderResourceManager::create(this);

diff --git a/src/engine_lib/private/render/general/pipeline/PipelineManager.cpp b/src/engine_lib/private/render/general/pipeline/PipelineManager.cpp
@@ -6,9 +6,9 @@
 #include "render/general/resources/GpuResourceManager.h"
 #include "shader/ComputeShaderInterface.h"
 #include "shader/general/resources/LightingShaderResourceManager.h"
-#include "shader/general/resources/cpuwrite/ShaderCpuWriteResourceBindingManager.h"
-#include "shader/general/resources/texture/ShaderTextureResourceBindingManager.h"
-#include "shader/general/resources/GlobalShaderResourceBindingManager.h"
+#include "shader/general/resources/binding/cpuwrite/ShaderCpuWriteResourceBindingManager.h"
+#include "shader/general/resources/binding/texture/ShaderTextureResourceBindingManager.h"
+#include "shader/general/resources/binding/global/GlobalShaderResourceBindingManager.h"
 #include "render/vulkan/pipeline/VulkanPipeline.h"
 
 namespace ne {