diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2020-09-10 22:38:48 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2020-09-10 22:38:48 +0000 |
| commit | 35aacd4de5326dac3d954ce3338281e5838fb0a0 (patch) | |
| tree | 877b1ad33245fcd294a5f4f23b8c70e65bae970b /Graphics/GraphicsEngineD3D12 | |
| parent | Fixed linux build error (diff) | |
| download | DiligentCore-35aacd4de5326dac3d954ce3338281e5838fb0a0.tar.gz DiligentCore-35aacd4de5326dac3d954ce3338281e5838fb0a0.zip | |
Few final updates to mesh shader implementation
Diffstat (limited to 'Graphics/GraphicsEngineD3D12')
| -rw-r--r-- | Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp index 5d33aefd..ecb18672 100644 --- a/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp +++ b/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp @@ -44,7 +44,7 @@ namespace { #ifdef _MSC_VER # pragma warning(push) -# pragma warning(disable : 4324) +# pragma warning(disable : 4324) // warning C4324: structure was padded due to alignment specifier #endif template <typename InnerStructType, D3D12_PIPELINE_STATE_SUBOBJECT_TYPE SubObjType> @@ -200,8 +200,6 @@ PipelineStateD3D12Impl::PipelineStateD3D12Impl(IReferenceCounters* pR D3D12_COMPUTE_PIPELINE_STATE_DESC d3d12PSODesc = {}; - d3d12PSODesc.pRootSignature = nullptr; - auto* pByteCode = ValidatedCast<ShaderD3D12Impl>(ComputePipeline.pCS)->GetShaderByteCode(); d3d12PSODesc.CS.pShaderBytecode = pByteCode->GetBufferPointer(); d3d12PSODesc.CS.BytecodeLength = pByteCode->GetBufferSize(); @@ -359,7 +357,6 @@ PipelineStateD3D12Impl::PipelineStateD3D12Impl(IReferenceCounters* pR d3d12PSODesc.pRootSignature = m_RootSig.GetD3D12RootSignature(); BlendStateDesc_To_D3D12_BLEND_DESC(GraphicsPipeline.BlendDesc, *d3d12PSODesc.BlendState); - // The sample mask for the blend state. d3d12PSODesc.SampleMask = GraphicsPipeline.SampleMask; RasterizerStateDesc_To_D3D12_RASTERIZER_DESC(GraphicsPipeline.RasterizerDesc, *d3d12PSODesc.RasterizerState); @@ -398,7 +395,7 @@ PipelineStateD3D12Impl::PipelineStateD3D12Impl(IReferenceCounters* pR #endif // D3D12_H_HAS_MESH_SHADER default: - LOG_ERROR_AND_THROW("Unknown shader type"); + LOG_ERROR_AND_THROW("Unsupported pipeline type"); } if (*m_Desc.Name != 0) |