Make GetLayoutByteSize part of PipelineFactory

deccer · deccer · commit 29801c25cf1c · 2022-04-24T22:32:15.000+02:00
diff --git a/src/Cpp/1-getting-started/1-1-3-HelloTriangle-Refactored/DeviceContext.cpp b/src/Cpp/1-getting-started/1-1-3-HelloTriangle-Refactored/DeviceContext.cpp
@@ -6,6 +6,8 @@
 DeviceContext::DeviceContext(WRL::ComPtr<ID3D11DeviceContext>&& deviceContext)
 {
     _deviceContext = std::move(deviceContext);
+    _activePipeline = nullptr;
+    _drawVertices = 0;
 }
 
 void DeviceContext::Clear(
diff --git a/src/Cpp/1-getting-started/1-1-3-HelloTriangle-Refactored/PipelineFactory.cpp b/src/Cpp/1-getting-started/1-1-3-HelloTriangle-Refactored/PipelineFactory.cpp
@@ -5,7 +5,7 @@
 
 #include <iostream>
 
-static size_t GetLayoutByteSize(VertexType vertexType)
+size_t PipelineFactory::GetLayoutByteSize(const VertexType vertexType)
 {
     switch (vertexType)
     {
diff --git a/src/Cpp/1-getting-started/1-1-3-HelloTriangle-Refactored/PipelineFactory.hpp b/src/Cpp/1-getting-started/1-1-3-HelloTriangle-Refactored/PipelineFactory.hpp
@@ -27,6 +27,8 @@ class PipelineFactory
         std::unique_ptr<Pipeline>& pipeline);
 
 private:
+    static size_t GetLayoutByteSize(VertexType vertexType);
+
     [[nodiscard]] WRL::ComPtr<ID3D11VertexShader> CreateVertexShader(
         const std::wstring& filePath,
         WRL::ComPtr<ID3DBlob>& vertexShaderBlob) const;
diff --git a/src/Cpp/1-getting-started/1-2-2-DebugLayer/DeviceContext.cpp b/src/Cpp/1-getting-started/1-2-2-DebugLayer/DeviceContext.cpp
@@ -6,6 +6,8 @@
 DeviceContext::DeviceContext(WRL::ComPtr<ID3D11DeviceContext>&& deviceContext)
 {
     _deviceContext = std::move(deviceContext);
+    _activePipeline = nullptr;
+    _drawVertices = 0;
 }
 
 void DeviceContext::Clear(
diff --git a/src/Cpp/1-getting-started/1-2-2-DebugLayer/PipelineFactory.cpp b/src/Cpp/1-getting-started/1-2-2-DebugLayer/PipelineFactory.cpp
@@ -5,7 +5,7 @@
 
 #include <iostream>
 
-static size_t GetLayoutByteSize(VertexType vertexType)
+size_t PipelineFactory::GetLayoutByteSize(const VertexType vertexType)
 {
     switch (vertexType)
     {
diff --git a/src/Cpp/1-getting-started/1-2-2-DebugLayer/PipelineFactory.hpp b/src/Cpp/1-getting-started/1-2-2-DebugLayer/PipelineFactory.hpp
@@ -27,6 +27,8 @@ class PipelineFactory
         std::unique_ptr<Pipeline>& pipeline);
 
 private:
+    static size_t GetLayoutByteSize(VertexType vertexType);
+
     [[nodiscard]] WRL::ComPtr<ID3D11VertexShader> CreateVertexShader(
         const std::wstring& filePath,
         WRL::ComPtr<ID3DBlob>& vertexShaderBlob) const;
diff --git a/src/Cpp/1-getting-started/1-2-3-NamingThings/DeviceContext.cpp b/src/Cpp/1-getting-started/1-2-3-NamingThings/DeviceContext.cpp
@@ -6,6 +6,8 @@
 DeviceContext::DeviceContext(WRL::ComPtr<ID3D11DeviceContext>&& deviceContext)
 {
     _deviceContext = std::move(deviceContext);
+    _activePipeline = nullptr;
+    _drawVertices = 0;
 }
 
 void DeviceContext::Clear(
diff --git a/src/Cpp/1-getting-started/1-2-3-NamingThings/PipelineFactory.cpp b/src/Cpp/1-getting-started/1-2-3-NamingThings/PipelineFactory.cpp
@@ -5,7 +5,7 @@
 
 #include <iostream>
 
-static size_t GetLayoutByteSize(VertexType vertexType)
+size_t PipelineFactory::GetLayoutByteSize(const VertexType vertexType)
 {
     switch (vertexType)
     {
diff --git a/src/Cpp/1-getting-started/1-2-3-NamingThings/PipelineFactory.hpp b/src/Cpp/1-getting-started/1-2-3-NamingThings/PipelineFactory.hpp
@@ -27,6 +27,8 @@ class PipelineFactory
         std::unique_ptr<Pipeline>& pipeline);
 
 private:
+    static size_t GetLayoutByteSize(VertexType vertexType);
+
     [[nodiscard]] WRL::ComPtr<ID3D11VertexShader> CreateVertexShader(
         const std::wstring& filePath,
         WRL::ComPtr<ID3DBlob>& vertexShaderBlob) const;
diff --git a/src/Cpp/1-getting-started/1-3-1-ImageLibrary/DeviceContext.cpp b/src/Cpp/1-getting-started/1-3-1-ImageLibrary/DeviceContext.cpp
@@ -6,6 +6,8 @@
 DeviceContext::DeviceContext(WRL::ComPtr<ID3D11DeviceContext>&& deviceContext)
 {
     _deviceContext = std::move(deviceContext);
+    _activePipeline = nullptr;
+    _drawVertices = 0;
 }
 
 void DeviceContext::Clear(
diff --git a/src/Cpp/1-getting-started/1-3-1-ImageLibrary/PipelineFactory.cpp b/src/Cpp/1-getting-started/1-3-1-ImageLibrary/PipelineFactory.cpp
@@ -6,7 +6,7 @@
 
 #include <iostream>
 
-static size_t GetLayoutByteSize(VertexType vertexType)
+size_t PipelineFactory::GetLayoutByteSize(const VertexType vertexType)
 {
     switch (vertexType)
     {
diff --git a/src/Cpp/1-getting-started/1-3-1-ImageLibrary/PipelineFactory.hpp b/src/Cpp/1-getting-started/1-3-1-ImageLibrary/PipelineFactory.hpp
@@ -25,6 +25,8 @@ class PipelineFactory
         std::unique_ptr<Pipeline>& pipeline);
 
 private:
+    static size_t GetLayoutByteSize(VertexType vertexType);
+
     [[nodiscard]] WRL::ComPtr<ID3D11VertexShader> CreateVertexShader(
         const std::wstring& filePath,
         WRL::ComPtr<ID3DBlob>& vertexShaderBlob) const;
diff --git a/src/Cpp/1-getting-started/1-3-2-LoadingMeshes-Refactored/DeviceContext.cpp b/src/Cpp/1-getting-started/1-3-2-LoadingMeshes-Refactored/DeviceContext.cpp
@@ -6,6 +6,9 @@
 DeviceContext::DeviceContext(WRL::ComPtr<ID3D11DeviceContext>&& deviceContext)
 {
     _deviceContext = std::move(deviceContext);
+    _activePipeline = nullptr;
+    _drawVertices = 0;
+    _drawIndices = 0;
 }
 
 void DeviceContext::Clear(
diff --git a/src/Cpp/1-getting-started/1-3-2-LoadingMeshes-Refactored/PipelineFactory.cpp b/src/Cpp/1-getting-started/1-3-2-LoadingMeshes-Refactored/PipelineFactory.cpp
@@ -6,7 +6,7 @@
 
 #include <iostream>
 
-static size_t GetLayoutByteSize(VertexType vertexType)
+size_t PipelineFactory::GetLayoutByteSize(const VertexType vertexType)
 {
     switch (vertexType)
     {
diff --git a/src/Cpp/1-getting-started/1-3-2-LoadingMeshes-Refactored/PipelineFactory.hpp b/src/Cpp/1-getting-started/1-3-2-LoadingMeshes-Refactored/PipelineFactory.hpp
@@ -25,6 +25,8 @@ class PipelineFactory
         std::unique_ptr<Pipeline>& pipeline);
 
 private:
+    static size_t GetLayoutByteSize(VertexType vertexType);
+
     [[nodiscard]] WRL::ComPtr<ID3D11VertexShader> CreateVertexShader(
         const std::wstring& filePath,
         WRL::ComPtr<ID3DBlob>& vertexShaderBlob) const;
diff --git a/src/Cpp/1-getting-started/1-3-2-LoadingMeshes/DeviceContext.cpp b/src/Cpp/1-getting-started/1-3-2-LoadingMeshes/DeviceContext.cpp
@@ -6,6 +6,9 @@
 DeviceContext::DeviceContext(WRL::ComPtr<ID3D11DeviceContext>&& deviceContext)
 {
     _deviceContext = std::move(deviceContext);
+    _activePipeline = nullptr;
+    _drawVertices = 0;
+    _drawIndices = 0;
 }
 
 void DeviceContext::Clear(
diff --git a/src/Cpp/1-getting-started/1-3-2-LoadingMeshes/PipelineFactory.cpp b/src/Cpp/1-getting-started/1-3-2-LoadingMeshes/PipelineFactory.cpp
@@ -6,7 +6,7 @@
 
 #include <iostream>
 
-static size_t GetLayoutByteSize(VertexType vertexType)
+size_t PipelineFactory::GetLayoutByteSize(const VertexType vertexType)
 {
     switch (vertexType)
     {
diff --git a/src/Cpp/1-getting-started/1-3-2-LoadingMeshes/PipelineFactory.hpp b/src/Cpp/1-getting-started/1-3-2-LoadingMeshes/PipelineFactory.hpp
@@ -25,6 +25,8 @@ class PipelineFactory
         std::unique_ptr<Pipeline>& pipeline);
 
 private:
+    static size_t GetLayoutByteSize(VertexType vertexType);
+
     [[nodiscard]] WRL::ComPtr<ID3D11VertexShader> CreateVertexShader(
         const std::wstring& filePath,
         WRL::ComPtr<ID3DBlob>& vertexShaderBlob) const;
diff --git a/src/Cpp/1-getting-started/1-3-3-DearImGui/DeviceContext.cpp b/src/Cpp/1-getting-started/1-3-3-DearImGui/DeviceContext.cpp
@@ -5,10 +5,13 @@
 #include <utility>
 
 DeviceContext::DeviceContext(
-    WRL::ComPtr<ID3D11Device>& device,
+    const WRL::ComPtr<ID3D11Device>& device,
     WRL::ComPtr<ID3D11DeviceContext>&& deviceContext)
 {
     _deviceContext = std::move(deviceContext);
+    _activePipeline = nullptr;
+    _drawVertices = 0;
+    _drawIndices = 0;
     ImGui_ImplDX11_Init(device.Get(), _deviceContext.Get());
 }
 
diff --git a/src/Cpp/1-getting-started/1-3-3-DearImGui/DeviceContext.hpp b/src/Cpp/1-getting-started/1-3-3-DearImGui/DeviceContext.hpp
@@ -13,7 +13,7 @@ class DeviceContext
 {
 public:
     DeviceContext(
-        WRL::ComPtr<ID3D11Device>& device,
+        const WRL::ComPtr<ID3D11Device>& device,
         WRL::ComPtr<ID3D11DeviceContext>&& deviceContext);
     ~DeviceContext();
 
diff --git a/src/Cpp/1-getting-started/1-3-3-DearImGui/PipelineFactory.cpp b/src/Cpp/1-getting-started/1-3-3-DearImGui/PipelineFactory.cpp
@@ -6,7 +6,7 @@
 
 #include <iostream>
 
-static size_t GetLayoutByteSize(VertexType vertexType)
+size_t PipelineFactory::GetLayoutByteSize(const VertexType vertexType)
 {
     switch (vertexType)
     {
diff --git a/src/Cpp/1-getting-started/1-3-3-DearImGui/PipelineFactory.hpp b/src/Cpp/1-getting-started/1-3-3-DearImGui/PipelineFactory.hpp
@@ -25,6 +25,8 @@ class PipelineFactory
         std::unique_ptr<Pipeline>& pipeline);
 
 private:
+    static size_t GetLayoutByteSize(VertexType vertexType);
+
     [[nodiscard]] WRL::ComPtr<ID3D11VertexShader> CreateVertexShader(
         const std::wstring& filePath,
         WRL::ComPtr<ID3DBlob>& vertexShaderBlob) const;
diff --git a/src/Cpp/1-getting-started/1-3-4-DepthBuffer/DeviceContext.cpp b/src/Cpp/1-getting-started/1-3-4-DepthBuffer/DeviceContext.cpp
@@ -5,10 +5,13 @@
 #include <utility>
 
 DeviceContext::DeviceContext(
-    WRL::ComPtr<ID3D11Device>& device,
+    const WRL::ComPtr<ID3D11Device>& device,
     WRL::ComPtr<ID3D11DeviceContext>&& deviceContext)
 {
     _deviceContext = std::move(deviceContext);
+    _activePipeline = nullptr;
+    _drawVertices = 0;
+    _drawIndices = 0;
     ImGui_ImplDX11_Init(device.Get(), _deviceContext.Get());
 }
 
diff --git a/src/Cpp/1-getting-started/1-3-4-DepthBuffer/DeviceContext.hpp b/src/Cpp/1-getting-started/1-3-4-DepthBuffer/DeviceContext.hpp
@@ -13,7 +13,7 @@ class DeviceContext
 {
 public:
     DeviceContext(
-        WRL::ComPtr<ID3D11Device>& device,
+        const WRL::ComPtr<ID3D11Device>& device,
         WRL::ComPtr<ID3D11DeviceContext>&& deviceContext);
     ~DeviceContext();
 
diff --git a/src/Cpp/1-getting-started/1-3-4-DepthBuffer/PipelineFactory.cpp b/src/Cpp/1-getting-started/1-3-4-DepthBuffer/PipelineFactory.cpp
@@ -6,7 +6,7 @@
 
 #include <iostream>
 
-static size_t GetLayoutByteSize(VertexType vertexType)
+size_t PipelineFactory::GetLayoutByteSize(const VertexType vertexType)
 {
     switch (vertexType)
     {
diff --git a/src/Cpp/1-getting-started/1-3-4-DepthBuffer/PipelineFactory.hpp b/src/Cpp/1-getting-started/1-3-4-DepthBuffer/PipelineFactory.hpp
@@ -25,6 +25,8 @@ class PipelineFactory
         std::unique_ptr<Pipeline>& pipeline);
 
 private:
+    static size_t GetLayoutByteSize(VertexType vertexType);
+
     [[nodiscard]] WRL::ComPtr<ID3D11VertexShader> CreateVertexShader(
         const std::wstring& filePath,
         WRL::ComPtr<ID3DBlob>& vertexShaderBlob) const;
diff --git a/src/Cpp/1-getting-started/1-3-5-RasterizerState/DeviceContext.cpp b/src/Cpp/1-getting-started/1-3-5-RasterizerState/DeviceContext.cpp
@@ -5,10 +5,13 @@
 #include <utility>
 
 DeviceContext::DeviceContext(
-    WRL::ComPtr<ID3D11Device>& device,
+    const WRL::ComPtr<ID3D11Device>& device,
     WRL::ComPtr<ID3D11DeviceContext>&& deviceContext)
 {
     _deviceContext = std::move(deviceContext);
+    _activePipeline = nullptr;
+    _drawVertices = 0;
+    _drawIndices = 0;
     ImGui_ImplDX11_Init(device.Get(), _deviceContext.Get());
 }
 
diff --git a/src/Cpp/1-getting-started/1-3-5-RasterizerState/DeviceContext.hpp b/src/Cpp/1-getting-started/1-3-5-RasterizerState/DeviceContext.hpp
@@ -13,7 +13,7 @@ class DeviceContext
 {
 public:
     DeviceContext(
-        WRL::ComPtr<ID3D11Device>& device,
+        const WRL::ComPtr<ID3D11Device>& device,
         WRL::ComPtr<ID3D11DeviceContext>&& deviceContext);
     ~DeviceContext();
 
diff --git a/src/Cpp/1-getting-started/1-3-5-RasterizerState/PipelineFactory.cpp b/src/Cpp/1-getting-started/1-3-5-RasterizerState/PipelineFactory.cpp
@@ -6,7 +6,7 @@
 
 #include <iostream>
 
-static size_t GetLayoutByteSize(VertexType vertexType)
+size_t PipelineFactory::GetLayoutByteSize(const VertexType vertexType)
 {
     switch (vertexType)
     {
diff --git a/src/Cpp/1-getting-started/1-3-5-RasterizerState/PipelineFactory.hpp b/src/Cpp/1-getting-started/1-3-5-RasterizerState/PipelineFactory.hpp
@@ -25,6 +25,8 @@ class PipelineFactory
         std::unique_ptr<Pipeline>& pipeline);
 
 private:
+    static size_t GetLayoutByteSize(VertexType vertexType);
+
     [[nodiscard]] WRL::ComPtr<ID3D11VertexShader> CreateVertexShader(
         const std::wstring& filePath,
         WRL::ComPtr<ID3DBlob>& vertexShaderBlob) const;
diff --git a/src/Cpp/1-getting-started/1-3-6-Camera/DeviceContext.cpp b/src/Cpp/1-getting-started/1-3-6-Camera/DeviceContext.cpp
@@ -5,10 +5,13 @@
 #include <utility>
 
 DeviceContext::DeviceContext(
-    WRL::ComPtr<ID3D11Device>& device,
+    const WRL::ComPtr<ID3D11Device>& device,
     WRL::ComPtr<ID3D11DeviceContext>&& deviceContext)
 {
     _deviceContext = std::move(deviceContext);
+    _activePipeline = nullptr;
+    _drawVertices = 0;
+    _drawIndices = 0;
     ImGui_ImplDX11_Init(device.Get(), _deviceContext.Get());
 }
 
diff --git a/src/Cpp/1-getting-started/1-3-6-Camera/DeviceContext.hpp b/src/Cpp/1-getting-started/1-3-6-Camera/DeviceContext.hpp
@@ -13,7 +13,7 @@ class DeviceContext
 {
 public:
     DeviceContext(
-        WRL::ComPtr<ID3D11Device>& device,
+        const WRL::ComPtr<ID3D11Device>& device,
         WRL::ComPtr<ID3D11DeviceContext>&& deviceContext);
     ~DeviceContext();
 
diff --git a/src/Cpp/1-getting-started/1-3-6-Camera/PipelineFactory.cpp b/src/Cpp/1-getting-started/1-3-6-Camera/PipelineFactory.cpp
@@ -6,7 +6,7 @@
 
 #include <iostream>
 
-static size_t GetLayoutByteSize(VertexType vertexType)
+size_t PipelineFactory::GetLayoutByteSize(const VertexType vertexType)
 {
     switch (vertexType)
     {
@@ -43,6 +43,7 @@ PipelineFactory::PipelineFactory(const WRL::ComPtr<ID3D11Device>& device)
             },
         }
     };
+
     _layoutMap[VertexType::PositionColorUv] =
     {
         {
diff --git a/src/Cpp/1-getting-started/1-3-6-Camera/PipelineFactory.hpp b/src/Cpp/1-getting-started/1-3-6-Camera/PipelineFactory.hpp
@@ -25,6 +25,8 @@ class PipelineFactory
         std::unique_ptr<Pipeline>& pipeline);
 
 private:
+    static size_t GetLayoutByteSize(VertexType vertexType);
+
     [[nodiscard]] WRL::ComPtr<ID3D11VertexShader> CreateVertexShader(
         const std::wstring& filePath,
         WRL::ComPtr<ID3DBlob>& vertexShaderBlob) const;

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@`
`6`	`6`	`DeviceContext::DeviceContext(WRL::ComPtr<ID3D11DeviceContext>&& deviceContext)`
`7`	`7`	`{`
`8`	`8`	`_deviceContext = std::move(deviceContext);`
	`9`	`+ _activePipeline = nullptr;`
	`10`	`+ _drawVertices = 0;`
`9`	`11`	`}`
`10`	`12`
`11`	`13`	`void DeviceContext::Clear(`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`#include <iostream>`
`7`	`7`
`8`		`-static size_t GetLayoutByteSize(VertexType vertexType)`
	`8`	`+size_t PipelineFactory::GetLayoutByteSize(const VertexType vertexType)`
`9`	`9`	`{`
`10`	`10`	`switch (vertexType)`
`11`	`11`	`{`