diff options
| author | lucy96chen <47800040+lucy96chen@users.noreply.github.com> | 2022-02-18 21:58:11 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-18 21:58:11 -0800 |
| commit | 7953c0b6e4e6328bacf9945763013f9e0af6e435 (patch) | |
| tree | 06a505ee160fefb6b2c0d1477c4da7504a613986 /tools/gfx/renderer-shared.cpp | |
| parent | e031e0e5fb05d024d56dc70c3dd4ef7111d98ba4 (diff) | |
Fully implement the ray tracing pipeline for Vulkan (#2136)
* Added implementation for dispatchRays() and ShaderTableImpl, currently missing extensions and createShaderTable()
* Code written, working on finding and fixing bugs
* SBT issues fixed; Added implementation for endEncoding() to ensure the bound pipeline is properly reset; Ray tracing pipeline example successfully runs without any validation errors
* Fixed some incorrectly merged lines
* Fixed spacing
* Fixed alignment for member variables in VulkanApi
* Restart CI
* Removed accidental comment kept from merge; Changed getName() call to getNameOverride()
Diffstat (limited to 'tools/gfx/renderer-shared.cpp')
| -rw-r--r-- | tools/gfx/renderer-shared.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/gfx/renderer-shared.cpp b/tools/gfx/renderer-shared.cpp index a97462c73..244146ca3 100644 --- a/tools/gfx/renderer-shared.cpp +++ b/tools/gfx/renderer-shared.cpp @@ -956,11 +956,11 @@ Result ShaderTableBase::init(const IShaderTable::Desc& desc) m_rayGenShaderCount = desc.rayGenShaderCount; m_missShaderCount = desc.missShaderCount; m_hitGroupCount = desc.hitGroupCount; - m_entryPointNames.reserve(desc.hitGroupCount + desc.missShaderCount + desc.rayGenShaderCount); + m_shaderGroupNames.reserve(desc.hitGroupCount + desc.missShaderCount + desc.rayGenShaderCount); m_recordOverwrites.reserve(desc.hitGroupCount + desc.missShaderCount + desc.rayGenShaderCount); for (uint32_t i = 0; i < desc.rayGenShaderCount; i++) { - m_entryPointNames.add(desc.rayGenShaderEntryPointNames[i]); + m_shaderGroupNames.add(desc.rayGenShaderEntryPointNames[i]); if (desc.rayGenShaderRecordOverwrites) { m_recordOverwrites.add(desc.rayGenShaderRecordOverwrites[i]); @@ -972,7 +972,7 @@ Result ShaderTableBase::init(const IShaderTable::Desc& desc) } for (uint32_t i = 0; i < desc.missShaderCount; i++) { - m_entryPointNames.add(desc.missShaderEntryPointNames[i]); + m_shaderGroupNames.add(desc.missShaderEntryPointNames[i]); if (desc.missShaderRecordOverwrites) { m_recordOverwrites.add(desc.missShaderRecordOverwrites[i]); @@ -984,7 +984,7 @@ Result ShaderTableBase::init(const IShaderTable::Desc& desc) } for (uint32_t i = 0; i < desc.hitGroupCount; i++) { - m_entryPointNames.add(desc.hitGroupNames[i]); + m_shaderGroupNames.add(desc.hitGroupNames[i]); if (desc.hitGroupRecordOverwrites) { m_recordOverwrites.add(desc.hitGroupRecordOverwrites[i]); |