Moved primitive topology from draw attribs to pipeline state desc

1 files changed, 8 insertions, 7 deletions

diff --git a/Graphics/GraphicsEngineD3D11/src/DeviceContextD3D11Impl.cpp b/Graphics/GraphicsEngineD3D11/src/DeviceContextD3D11Impl.cpp
index fd8e58f1..772ea60c 100644
--- a/Graphics/GraphicsEngineD3D11/src/DeviceContextD3D11Impl.cpp
+++ b/Graphics/GraphicsEngineD3D11/src/DeviceContextD3D11Impl.cpp
@@ -117,6 +117,14 @@ namespace Diligent
                 m_pd3d11DeviceContext->IASetInputLayout( pd3d11InputLayout );
                 m_CommittedD3D11InputLayout = pd3d11InputLayout;
             }
+
+            auto PrimTopology = Desc.GraphicsPipeline.PrimitiveTopology;
+            if (m_CommittedPrimitiveTopology != PrimTopology)
+            {
+                m_CommittedPrimitiveTopology = PrimTopology;
+                m_CommittedD3D11PrimTopology = TopologyToD3D11Topology(PrimTopology);
+                m_pd3d11DeviceContext->IASetPrimitiveTopology(m_CommittedD3D11PrimTopology);
+            }
         }
     }
 
@@ -707,13 +715,6 @@ namespace Diligent
         }
 #endif
 
-        if(m_CommittedPrimitiveTopology != DrawAttribs.Topology)
-        {
-            m_CommittedPrimitiveTopology = DrawAttribs.Topology;
-            m_CommittedD3D11PrimTopology = TopologyToD3D11Topology( DrawAttribs.Topology );
-            m_pd3d11DeviceContext->IASetPrimitiveTopology( m_CommittedD3D11PrimTopology );
-        }
-        
         if( DrawAttribs.IsIndirect )
         {
             VERIFY( DrawAttribs.pIndirectDrawAttribs, "Indirect draw command attributes buffer is not set" );