Add RSV and DSV formats to PipelineStateDescription

mogemimi · Mar 22, 2016 · 8690aa3 · 8690aa3
1 parent 0ffb391
commit 8690aa3
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 0 deletions.
diff --git a/include/Pomdog/Content/AssetBuilders/PipelineStateBuilder.hpp b/include/Pomdog/Content/AssetBuilders/PipelineStateBuilder.hpp
@@ -7,6 +7,7 @@
 #include "Pomdog/Basic/Export.hpp"
 #include <string>
 #include <memory>
+#include <vector>
 
 namespace Pomdog {
 namespace Detail {
@@ -46,6 +47,12 @@ class POMDOG_EXPORT Builder<PipelineState> {
 
     Builder & SetConstantBufferBindSlot(std::string const& name, int slotIndex);
 
+    Builder & SetRenderTargetViewFormats(std::vector<SurfaceFormat> const& renderTargetViewFormats);
+
+    Builder & SetRenderTargetViewFormats(std::vector<SurfaceFormat> && renderTargetViewFormats);
+
+    Builder & SetDepthStencilViewFormat(DepthFormat depthStencilViewFormat);
+
     std::shared_ptr<PipelineState> Build();
 
     std::shared_ptr<EffectReflection> CreateEffectReflection(

diff --git a/include/Pomdog/Graphics/PipelineStateDescription.hpp b/include/Pomdog/Graphics/PipelineStateDescription.hpp
@@ -4,9 +4,11 @@
 
 #include "Pomdog/Graphics/detail/ForwardDeclarations.hpp"
 #include "Pomdog/Graphics/BlendDescription.hpp"
+#include "Pomdog/Graphics/DepthFormat.hpp"
 #include "Pomdog/Graphics/DepthStencilDescription.hpp"
 #include "Pomdog/Graphics/InputLayoutDescription.hpp"
 #include "Pomdog/Graphics/RasterizerDescription.hpp"
+#include "Pomdog/Graphics/SurfaceFormat.hpp"
 #include <memory>
 #include <vector>
 #include <string>
@@ -24,6 +26,8 @@ struct PipelineStateDescription {
     BlendDescription BlendState;
     RasterizerDescription RasterizerState;
     DepthStencilDescription DepthStencilState;
+    std::vector<SurfaceFormat> RenderTargetViewFormats;
+    DepthFormat DepthStencilViewFormat;
     std::uint32_t MultiSampleMask;
 };
 

diff --git a/src/Content/AssetBuilders/PipelineStateBuilder.cpp b/src/Content/AssetBuilders/PipelineStateBuilder.cpp
@@ -9,6 +9,7 @@
 #include "Pomdog/Graphics/Shader.hpp"
 #include "Pomdog/Utility/Assert.hpp"
 #include "Pomdog/Utility/Exception.hpp"
+#include "Pomdog/Logging/Log.hpp"
 #include <utility>
 
 namespace Pomdog {
@@ -22,6 +23,8 @@ class Builder<PipelineState>::Impl final {
     bool hasBlendState;
     bool hasRasterizerState;
     bool hasDepthStencilState;
+    bool hasRenderTargetViewFormats;
+    bool hasDepthStencilViewFormat;
 
     Impl();
 
@@ -35,6 +38,8 @@ Builder<PipelineState>::Impl::Impl()
     hasBlendState = false;
     hasRasterizerState = false;
     hasDepthStencilState = false;
+    hasRenderTargetViewFormats = false;
+    hasDepthStencilViewFormat = false;
 }
 //-----------------------------------------------------------------------
 std::shared_ptr<PipelineState> Builder<PipelineState>::Impl::Load()
@@ -56,6 +61,26 @@ std::shared_ptr<PipelineState> Builder<PipelineState>::Impl::Load()
         hasDepthStencilState = true;
     }
 
+    if (!hasRenderTargetViewFormats) {
+#if defined(DEBUG) && !defined(NDEBUG)
+        Log::Warning(
+            "Pomdog",
+            "[Warning] Please call Builder<PipelineState>::SetRenderTargetViewFormats() in your code.");
+#endif
+        description.RenderTargetViewFormats = { SurfaceFormat::R8G8B8A8_UNorm };
+        hasRenderTargetViewFormats = true;
+    }
+
+    if (!hasDepthStencilViewFormat) {
+#if defined(DEBUG) && !defined(NDEBUG)
+        Log::Warning(
+            "Pomdog",
+            "[Warning] Please call Builder<PipelineState>::SetDepthStencilViewFormat() in your code.");
+#endif
+        description.DepthStencilViewFormat = DepthFormat::None;
+        hasDepthStencilViewFormat = true;
+    }
+
     auto pipelineState = std::make_shared<PipelineState>(graphicsDevice, description);
     return std::move(pipelineState);
 }
@@ -174,6 +199,33 @@ Builder<PipelineState> & Builder<PipelineState>::SetConstantBufferBindSlot(
     return *this;
 }
 //-----------------------------------------------------------------------
+Builder<PipelineState> & Builder<PipelineState>::SetRenderTargetViewFormats(
+    std::vector<SurfaceFormat> const& renderTargetViewFormats)
+{
+    POMDOG_ASSERT(impl);
+    impl->description.RenderTargetViewFormats = renderTargetViewFormats;
+    impl->hasRenderTargetViewFormats = true;
+    return *this;
+}
+//-----------------------------------------------------------------------
+Builder<PipelineState> & Builder<PipelineState>::SetRenderTargetViewFormats(
+    std::vector<SurfaceFormat> && renderTargetViewFormats)
+{
+    POMDOG_ASSERT(impl);
+    impl->description.RenderTargetViewFormats = std::move(renderTargetViewFormats);
+    impl->hasRenderTargetViewFormats = true;
+    return *this;
+}
+//-----------------------------------------------------------------------
+Builder<PipelineState> & Builder<PipelineState>::SetDepthStencilViewFormat(
+    DepthFormat depthStencilViewFormat)
+{
+    POMDOG_ASSERT(impl);
+    impl->description.DepthStencilViewFormat = depthStencilViewFormat;
+    impl->hasDepthStencilViewFormat = true;
+    return *this;
+}
+//-----------------------------------------------------------------------
 std::shared_ptr<PipelineState> Builder<PipelineState>::Build()
 {
     POMDOG_ASSERT(impl);