diff options
| author | azhirnov <zh1dron@gmail.com> | 2020-11-18 02:01:18 +0000 |
|---|---|---|
| committer | azhirnov <zh1dron@gmail.com> | 2020-11-18 02:01:18 +0000 |
| commit | a8d6acd496404dc5b01df997ad9d07504d6ccf1b (patch) | |
| tree | 47bde1f0dad761bc82299fb7d3dee6c5a6af5e8b /Graphics/GraphicsEngineD3D12 | |
| parent | Merge branch 'master' into ray_tracing_2 (diff) | |
| download | DiligentCore-a8d6acd496404dc5b01df997ad9d07504d6ccf1b.tar.gz DiligentCore-a8d6acd496404dc5b01df997ad9d07504d6ccf1b.zip | |
Removed SWAP_CHAIN_USAGE_UNORDERED_ACCESS, fixed shader group checks
Diffstat (limited to 'Graphics/GraphicsEngineD3D12')
| -rw-r--r-- | Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp index 3c63b7d7..f98781eb 100644 --- a/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp +++ b/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp @@ -205,7 +205,7 @@ void BuildRTPipelineDescription(const RayTracingPipelineStateCreateInfo& CreateI Subobjects.push_back({D3D12_STATE_SUBOBJECT_TYPE_HIT_GROUP, &HitGroupDesc}); } - constexpr Uint32 MaxPayloadSize = sizeof(float) * 8; + constexpr Uint32 DefaultPayloadSize = sizeof(float) * 8; constexpr Uint32 RecursionDepthLimit = D3D12_RAYTRACING_MAX_DECLARABLE_TRACE_RECURSION_DEPTH - 1; if (CreateInfo.RayTracingPipeline.MaxRecursionDepth > RecursionDepthLimit) @@ -218,7 +218,7 @@ void BuildRTPipelineDescription(const RayTracingPipelineStateCreateInfo& CreateI auto& ShaderConfig = *TempPool.Construct<D3D12_RAYTRACING_SHADER_CONFIG>(); ShaderConfig.MaxAttributeSizeInBytes = CreateInfo.MaxAttributeSize == 0 ? D3D12_RAYTRACING_MAX_ATTRIBUTE_SIZE_IN_BYTES : CreateInfo.MaxAttributeSize; - ShaderConfig.MaxPayloadSizeInBytes = CreateInfo.MaxPayloadSize == 0 ? MaxPayloadSize : CreateInfo.MaxPayloadSize; + ShaderConfig.MaxPayloadSizeInBytes = CreateInfo.MaxPayloadSize == 0 ? DefaultPayloadSize : CreateInfo.MaxPayloadSize; Subobjects.push_back({D3D12_STATE_SUBOBJECT_TYPE_RAYTRACING_SHADER_CONFIG, &ShaderConfig}); #undef LOG_PSO_ERROR_AND_THROW } |