diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2020-10-30 05:45:25 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2020-10-30 05:45:25 +0000 |
| commit | 85129a6868aca02adc80a0a5360fa47579dac526 (patch) | |
| tree | a71114df82f1369eb2a06193f17a8d25105e2233 /Graphics/GraphicsEngine | |
| parent | added ray tracing implementation for dx12 and vulkan (diff) | |
| download | DiligentCore-85129a6868aca02adc80a0a5360fa47579dac526.tar.gz DiligentCore-85129a6868aca02adc80a0a5360fa47579dac526.zip | |
Added include tests for BLAS, TLAS and SBT headers, fixed few issues
Diffstat (limited to 'Graphics/GraphicsEngine')
| -rw-r--r-- | Graphics/GraphicsEngine/include/ShaderBindingTableBase.hpp | 8 | ||||
| -rw-r--r-- | Graphics/GraphicsEngine/interface/BottomLevelAS.h | 2 | ||||
| -rw-r--r-- | Graphics/GraphicsEngine/interface/ShaderBindingTable.h | 1 |
3 files changed, 6 insertions, 5 deletions
diff --git a/Graphics/GraphicsEngine/include/ShaderBindingTableBase.hpp b/Graphics/GraphicsEngine/include/ShaderBindingTableBase.hpp index 155ecb66..35371958 100644 --- a/Graphics/GraphicsEngine/include/ShaderBindingTableBase.hpp +++ b/Graphics/GraphicsEngine/include/ShaderBindingTableBase.hpp @@ -186,10 +186,10 @@ protected: IMPLEMENT_QUERY_INTERFACE_IN_PLACE(IID_ShaderBindingTable, TDeviceObjectBase) protected: - std::vector<Uint8> m_RayGenShaderRecord; - std::vector<Uint8> m_MissShadersRecord; - std::vector<Uint8> m_CallableShadersRecord; - std::vector<Uint8> m_HitGroupsRecord; + std::vector<Uint8> m_RayGenShaderRecord; + std::vector<Uint8> m_MissShadersRecord; + std::vector<Uint8> m_CallableShadersRecord; + std::vector<Uint8> m_HitGroupsRecord; Uint32 m_ShaderRecordStride = 0; bool m_Changed = true; diff --git a/Graphics/GraphicsEngine/interface/BottomLevelAS.h b/Graphics/GraphicsEngine/interface/BottomLevelAS.h index 264720ff..d2f1ed0f 100644 --- a/Graphics/GraphicsEngine/interface/BottomLevelAS.h +++ b/Graphics/GraphicsEngine/interface/BottomLevelAS.h @@ -184,7 +184,7 @@ typedef struct ScratchBufferSizes ScratchBufferSizes; #define IBottomLevelASInclusiveMethods \ IDeviceObjectInclusiveMethods; \ - IBottomLevelASMethods IBottomLevelAS + IBottomLevelASMethods BottomLevelAS /// AZ TODO DILIGENT_BEGIN_INTERFACE(IBottomLevelAS, IDeviceObject) diff --git a/Graphics/GraphicsEngine/interface/ShaderBindingTable.h b/Graphics/GraphicsEngine/interface/ShaderBindingTable.h index 71fa25e4..2a5e587a 100644 --- a/Graphics/GraphicsEngine/interface/ShaderBindingTable.h +++ b/Graphics/GraphicsEngine/interface/ShaderBindingTable.h @@ -36,6 +36,7 @@ #include "Constants.h" #include "Buffer.h" #include "PipelineState.h" +#include "TopLevelAS.h" DILIGENT_BEGIN_NAMESPACE(Diligent) |