diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2020-11-10 05:24:46 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2020-11-10 05:24:46 +0000 |
| commit | 5888241b0f6127c82b64caebb9cb61b933ba4535 (patch) | |
| tree | 55b46a800690c5450c613820dcbb84c2c425f5ea /Graphics/GraphicsEngineD3D12 | |
| parent | Added ability to update AS. (diff) | |
| download | DiligentCore-5888241b0f6127c82b64caebb9cb61b933ba4535.tar.gz DiligentCore-5888241b0f6127c82b64caebb9cb61b933ba4535.zip | |
A bunch of minor updates
Diffstat (limited to 'Graphics/GraphicsEngineD3D12')
| -rw-r--r-- | Graphics/GraphicsEngineD3D12/interface/RenderDeviceD3D12.h | 18 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp | 4 |
2 files changed, 11 insertions, 11 deletions
diff --git a/Graphics/GraphicsEngineD3D12/interface/RenderDeviceD3D12.h b/Graphics/GraphicsEngineD3D12/interface/RenderDeviceD3D12.h index 8d8d1fba..6616126c 100644 --- a/Graphics/GraphicsEngineD3D12/interface/RenderDeviceD3D12.h +++ b/Graphics/GraphicsEngineD3D12/interface/RenderDeviceD3D12.h @@ -111,11 +111,11 @@ DILIGENT_BEGIN_INTERFACE(IRenderDeviceD3D12, IRenderDevice) /// The function calls AddRef(), so that the new object will contain /// one reference. VIRTUAL void METHOD(CreateBLASFromD3DResource)(THIS_ - ID3D12Resource* pd3d12BLAS, - const BottomLevelASDesc REF Desc, - RESOURCE_STATE InitialState, - IBottomLevelAS** ppBLAS) PURE; - + ID3D12Resource* pd3d12BLAS, + const BottomLevelASDesc REF Desc, + RESOURCE_STATE InitialState, + IBottomLevelAS** ppBLAS) PURE; + /// Creates a top-level AS object from native d3d12 resoruce /// \param [in] pd3d12TLAS - Pointer to the native d3d12 acceleration structure resource @@ -127,10 +127,10 @@ DILIGENT_BEGIN_INTERFACE(IRenderDeviceD3D12, IRenderDevice) /// The function calls AddRef(), so that the new object will contain /// one reference. VIRTUAL void METHOD(CreateTLASFromD3DResource)(THIS_ - ID3D12Resource* pd3d12TLAS, - const TopLevelASDesc REF Desc, - RESOURCE_STATE InitialState, - ITopLevelAS** ppTLAS) PURE; + ID3D12Resource* pd3d12TLAS, + const TopLevelASDesc REF Desc, + RESOURCE_STATE InitialState, + ITopLevelAS** ppTLAS) PURE; }; DILIGENT_END_INTERFACE diff --git a/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp index be30c978..84453dfa 100644 --- a/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp +++ b/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp @@ -208,9 +208,9 @@ void BuildRTPipelineDescription(const RayTracingPipelineStateCreateInfo& CreateI VERIFY_EXPR(Uint32{CreateInfo.GeneralShaderCount} + Uint32{CreateInfo.TriangleHitShaderCount} + Uint32{CreateInfo.ProceduralHitShaderCount} == GroupIndex); - const Uint32 RecursionDepthLimit = D3D12_RAYTRACING_MAX_DECLARABLE_TRACE_RECURSION_DEPTH - 1; + constexpr Uint32 RecursionDepthLimit = D3D12_RAYTRACING_MAX_DECLARABLE_TRACE_RECURSION_DEPTH - 1; if (CreateInfo.RayTracingPipeline.MaxRecursionDepth > RecursionDepthLimit) - LOG_PSO_ERROR_AND_THROW("MaxRecursionDepth must be less than or equal to ", RecursionDepthLimit); + LOG_PSO_ERROR_AND_THROW("MaxRecursionDepth (", CreateInfo.RayTracingPipeline.MaxRecursionDepth, ") must be <= ", RecursionDepthLimit); auto& PipelineConfig = *TempPool.Construct<D3D12_RAYTRACING_PIPELINE_CONFIG>(); // For compatibility with Vulkan set minimal recursion depth to one, zero means no tracing of rays at all. |