diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2020-12-18 06:48:37 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2020-12-18 06:48:37 +0000 |
| commit | 0473fce7808dcf75f5bca902562f2dc6f6f53679 (patch) | |
| tree | adede75fd9e426da564c43a7be6310c32466eec8 /Graphics/GraphicsEngine | |
| parent | Another set of minor updates (diff) | |
| download | DiligentCore-0473fce7808dcf75f5bca902562f2dc6f6f53679.tar.gz DiligentCore-0473fce7808dcf75f5bca902562f2dc6f6f53679.zip | |
Updated API to 240080 + fixed SBTBase
Diffstat (limited to 'Graphics/GraphicsEngine')
| -rw-r--r-- | Graphics/GraphicsEngine/include/ShaderBindingTableBase.hpp | 2 | ||||
| -rw-r--r-- | Graphics/GraphicsEngine/interface/APIInfo.h | 2 | ||||
| -rw-r--r-- | Graphics/GraphicsEngine/interface/PipelineState.h | 7 |
3 files changed, 9 insertions, 2 deletions
diff --git a/Graphics/GraphicsEngine/include/ShaderBindingTableBase.hpp b/Graphics/GraphicsEngine/include/ShaderBindingTableBase.hpp index 9554dda1..6a710636 100644 --- a/Graphics/GraphicsEngine/include/ShaderBindingTableBase.hpp +++ b/Graphics/GraphicsEngine/include/ShaderBindingTableBase.hpp @@ -272,7 +272,7 @@ public: #ifdef DILIGENT_DEVELOPMENT VERIFY_EXPR(Index >= Info.FirstContributionToHitGroupIndex && Index <= Info.LastContributionToHitGroupIndex); - OnBindHitGroup(pTLASImpl, BeginIndex + i); + OnBindHitGroup(pTLASImpl, Index); #endif } } diff --git a/Graphics/GraphicsEngine/interface/APIInfo.h b/Graphics/GraphicsEngine/interface/APIInfo.h index 3ade31f3..2f30c5aa 100644 --- a/Graphics/GraphicsEngine/interface/APIInfo.h +++ b/Graphics/GraphicsEngine/interface/APIInfo.h @@ -30,7 +30,7 @@ /// \file /// Diligent API information -#define DILIGENT_API_VERSION 240079 +#define DILIGENT_API_VERSION 240080 #include "../../../Primitives/interface/BasicTypes.h" diff --git a/Graphics/GraphicsEngine/interface/PipelineState.h b/Graphics/GraphicsEngine/interface/PipelineState.h index 875c6a21..527e32ce 100644 --- a/Graphics/GraphicsEngine/interface/PipelineState.h +++ b/Graphics/GraphicsEngine/interface/PipelineState.h @@ -484,6 +484,13 @@ struct RayTracingPipelineStateCreateInfo DILIGENT_DERIVE(PipelineStateCreateInfo /// Direct3D12 only: the maximum payload size in bytes. /// If zero then maximum allowed size will be used. Uint32 MaxPayloadSize DEFAULT_INITIALIZER(0); + +#if DILIGENT_CPP_INTERFACE + RayTracingPipelineStateCreateInfo() noexcept + { + PSODesc.PipelineType = PIPELINE_TYPE_RAY_TRACING; + } +#endif }; typedef struct RayTracingPipelineStateCreateInfo RayTracingPipelineStateCreateInfo; |