mv fixes

NcStudios · Dec 22, 2024 · 64ae091 · 64ae091
1 parent b295090
commit 64ae091
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 22 deletions.
diff --git a/source/ncengine/graphics2/NcGraphicsImpl2.cpp b/source/ncengine/graphics2/NcGraphicsImpl2.cpp
@@ -2,7 +2,7 @@
 #include "diligent/pass/MaterialPass.h"
 #include "diligent/pass/PassUtilities.h"
 #include "diligent/pass/WireframePass.h"
-#include "diligent/resource/PostProcessSinkIndexBufferResource.h"
+#include "diligent/resource/SinkIndexBufferResource.h"
 #include "frontend/FrontendRenderState.h"
 
 #include "ncengine/asset/NcAsset.h"

diff --git a/source/ncengine/graphics2/diligent/pass/MaterialPass.cpp b/source/ncengine/graphics2/diligent/pass/MaterialPass.cpp
@@ -2,7 +2,7 @@
 #include "PassUtilities.h"
 #include "graphics2/diligent/ShaderFactory.h"
 #include "graphics2/diligent/resource/MeshBuffer.h"
-#include "graphics2/diligent/resource/PostProcessSinkIndexBufferResource.h"
+#include "graphics2/diligent/resource/SinkIndexBufferResource.h"
 #include "graphics2/diligent/resource/ShaderBindings.h"
 
 #include <ranges>

diff --git a/source/ncengine/graphics2/diligent/pass/PassBackend.cpp b/source/ncengine/graphics2/diligent/pass/PassBackend.cpp
@@ -2,9 +2,9 @@
 #include "PassUtilities.h"
 #include "graphics2/diligent/resource/PerPassResourceSignature.h"
 #include "graphics2/diligent/resource/PostProcessPropertyBufferResource.h"
-#include "graphics2/diligent/resource/PostProcessSinkIndexBufferResource.h"
 #include "graphics2/diligent/resource/ResourceTypes.h"
 #include "graphics2/diligent/resource/ShaderBindings.h"
+#include "graphics2/diligent/resource/SinkIndexBufferResource.h"
 #include "graphics2/diligent/resource/WireframeBufferResource.h"
 #include "graphics2/frontend/subsystem/PostProcessState.h"
 #include "ncengine/debug/Profile.h"

diff --git a/source/ncengine/graphics2/diligent/pass/PostProcessPass.cpp b/source/ncengine/graphics2/diligent/pass/PostProcessPass.cpp
@@ -1,7 +1,7 @@
 #include "PostProcessPass.h"
 #include "graphics2/diligent/ShaderFactory.h"
 #include "graphics2/diligent/pass/PassUtilities.h"
-#include "graphics2/diligent/resource/PostProcessSinkIndexBufferResource.h"
+#include "graphics2/diligent/resource/SinkIndexBufferResource.h"
 #include "graphics2/diligent/resource/ShaderBindings.h"
 
 #include "ncengine/graphics/GraphicsUtility.h"

diff --git a/source/ncengine/graphics2/diligent/pass/WireframePass.cpp b/source/ncengine/graphics2/diligent/pass/WireframePass.cpp
@@ -3,7 +3,7 @@
 #include "graphics2/diligent/ShaderFactory.h"
 #include "graphics2/diligent/resource/MeshBuffer.h"
 #include "graphics2/diligent/resource/SinkBufferResource.h"
-#include "graphics2/diligent/resource/PostProcessSinkIndexBufferResource.h"
+#include "graphics2/diligent/resource/SinkIndexBufferResource.h"
 #include "graphics2/diligent/resource/ShaderBindings.h"
 #include "graphics2/diligent/resource/WireframeBufferResource.h"
 

diff --git a/source/ncengine/graphics2/diligent/resource/CMakeLists.txt b/source/ncengine/graphics2/diligent/resource/CMakeLists.txt
@@ -5,10 +5,10 @@ target_sources(${NC_ENGINE_LIB}
         PerFrameResourceSignature.cpp
         PerPassResourceSignature.cpp
         PostProcessPropertyBufferResource.cpp
-        PostProcessSinkIndexBufferResource.cpp
         ResourceTypes.cpp
         ShaderBindings.cpp
         SinkBufferResource.cpp
+        SinkIndexBufferResource.cpp
         TextureBufferResource.cpp
         WireframeBufferResource.cpp
 )

diff --git a/source/ncengine/graphics2/diligent/resource/PerPassResourceSignature.cpp b/source/ncengine/graphics2/diligent/resource/PerPassResourceSignature.cpp
@@ -1,6 +1,6 @@
 #include "PerPassResourceSignature.h"
 #include "SinkBufferResource.h"
-#include "PostProcessSinkIndexBufferResource.h"
+#include "SinkIndexBufferResource.h"
 
 #include "ncutility/NcError.h"
 
@@ -54,7 +54,7 @@ PerPassResourceSignature::PerPassResourceSignature(Diligent::IRenderDevice& devi
         MakeDepthSinkBufferDesc(depthSinkResourceDesc.maxElementCount)
     );
 
-    m_sinkIndexBufferResource = std::make_unique<PostProcessSinkIndexBufferResource>(
+    m_sinkIndexBufferResource = std::make_unique<SinkIndexBufferResource>(
         context, device,
         GetVariable(sinkIndexResourceDesc.shaderType, sinkIndexResourceDesc.resourceKey.data(), m_srb)
     );

diff --git a/source/ncengine/graphics2/diligent/resource/PerPassResourceSignature.h b/source/ncengine/graphics2/diligent/resource/PerPassResourceSignature.h
@@ -12,7 +12,7 @@
 namespace nc::graphics
 {
 class SinkBufferResource;
-struct PostProcessSinkIndexBufferResource;
+class SinkIndexBufferResource;
 
 class PerPassResourceSignature
 {
@@ -31,13 +31,13 @@ class PerPassResourceSignature
         auto GetResourceBinding()         -> Diligent::IShaderResourceBinding&     { return *m_srb; }
         auto GetColorSinkBufferResource() -> SinkBufferResource&                   { return *m_colorSinkBufferResource; }
         auto GetDepthSinkBufferResource() -> SinkBufferResource&                   { return *m_depthSinkBufferResource; }
-        auto GetSinkIndexBufferResource() -> PostProcessSinkIndexBufferResource&   { return *m_sinkIndexBufferResource; }
+        auto GetSinkIndexBufferResource() -> SinkIndexBufferResource&              { return *m_sinkIndexBufferResource; }
 
     private:
         Diligent::RefCntAutoPtr<Diligent::IShaderResourceBinding> m_srb;
         Diligent::RefCntAutoPtr<Diligent::IPipelineResourceSignature> m_signature;
         std::unique_ptr<SinkBufferResource> m_colorSinkBufferResource;
         std::unique_ptr<SinkBufferResource> m_depthSinkBufferResource;
-        std::unique_ptr<PostProcessSinkIndexBufferResource> m_sinkIndexBufferResource;
+        std::unique_ptr<SinkIndexBufferResource> m_sinkIndexBufferResource;
 };
 } // namespace nc::graphics
diff --git a/source/ncengine/graphics2/diligent/resource/ShaderBindings.cpp b/source/ncengine/graphics2/diligent/resource/ShaderBindings.cpp
@@ -1,7 +1,7 @@
 #include "ShaderBindings.h"
 #include "EnvironmentBufferResource.h"
 #include "graphics2/diligent/resource/SinkBufferResource.h"
-#include "graphics2/diligent/resource/PostProcessSinkIndexBufferResource.h"
+#include "graphics2/diligent/resource/SinkIndexBufferResource.h"
 #include "graphics2/frontend/FrontendRenderState.h"
 
 #include "ncengine/debug/Profile.h"

diff --git a/source/ncengine/graphics2/diligent/resource/SinkIndexBufferResource.cpp b/source/ncengine/graphics2/diligent/resource/SinkIndexBufferResource.cpp
@@ -1,14 +1,14 @@
-#include "PostProcessSinkIndexBufferResource.h"
+#include "SinkIndexBufferResource.h"
 
 #include "ncutility/NcError.h"
 
 #include <array>
 
 namespace nc::graphics
 {
-PostProcessSinkIndexBufferResource::PostProcessSinkIndexBufferResource(Diligent::IDeviceContext& context,
-                                                                       Diligent::IRenderDevice& device,
-                                                                       Diligent::IShaderResourceVariable& variable)
+SinkIndexBufferResource::SinkIndexBufferResource(Diligent::IDeviceContext& context,
+                                                 Diligent::IRenderDevice& device,
+                                                 Diligent::IShaderResourceVariable& variable)
     : m_buffer{
         context,
         device,
@@ -19,7 +19,9 @@ PostProcessSinkIndexBufferResource::PostProcessSinkIndexBufferResource(Diligent:
     m_variable->Set(&m_buffer.GetBuffer());
 }
 
-void PostProcessSinkIndexBufferResource::Update(Diligent::IDeviceContext& context, std::span<const uint32_t> colorSources, std::span<const uint32_t> depthSources)
+void SinkIndexBufferResource::Update(Diligent::IDeviceContext& context,
+                                     std::span<const uint32_t> colorSources,
+                                     std::span<const uint32_t> depthSources)
 {
     NC_ASSERT(colorSources.size() <= 4u, "Only four color sources supported.");
     NC_ASSERT(depthSources.size() <= 4u, "Only four depth sources supported.");

diff --git a/source/ncengine/graphics2/diligent/resource/SinkIndexBufferResource.h b/source/ncengine/graphics2/diligent/resource/SinkIndexBufferResource.h
@@ -10,16 +10,18 @@
 
 namespace nc::graphics
 {
-struct PostProcessSinkIndexBufferResource
+class SinkIndexBufferResource
 {
     public:
         static constexpr auto UniformBufferName = "PostProcessSinkIndexBuffer";
 
-        explicit PostProcessSinkIndexBufferResource(Diligent::IDeviceContext& context,
-                                                    Diligent::IRenderDevice& device,
-                                                    Diligent::IShaderResourceVariable& variable);
+        explicit SinkIndexBufferResource(Diligent::IDeviceContext& context,
+                                         Diligent::IRenderDevice& device,
+                                         Diligent::IShaderResourceVariable& variable);
 
-        void Update(Diligent::IDeviceContext& context, std::span<const uint32_t> colorSources, std::span<const uint32_t> depthSources);
+        void Update(Diligent::IDeviceContext& context,
+                    std::span<const uint32_t> colorSources,
+                    std::span<const uint32_t> depthSources);
 
         auto GetShaderVariable() -> Diligent::IShaderResourceVariable&
         {