Skip to content

Commit 94cb188

Browse files
author
kevyuu
committed
Improve naming of hit group
1 parent 9ed0945 commit 94cb188

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

include/nbl/asset/IRayTracingPipeline.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class IRayTracingPipelineBase : public virtual core::IReferenceCounted
2626
{
2727
uint32_t closestHit = SIndex::Unused;
2828
uint32_t anyHit = SIndex::Unused;
29-
uint32_t intersectionShader = SIndex::Unused;
29+
uint32_t intersection = SIndex::Unused;
3030
};
3131

3232
SIndex raygen;
@@ -137,7 +137,7 @@ class IRayTracingPipeline : public IPipeline<PipelineLayoutType>, public IRayTra
137137
bool(flags & FLAGS::NO_NULL_CLOSEST_HIT_SHADERS)))
138138
return false;
139139

140-
if (!isValidShaderIndex(shaderGroup.intersectionShader,
140+
if (!isValidShaderIndex(shaderGroup.intersection,
141141
ICPUShader::E_SHADER_STAGE::ESS_INTERSECTION,
142142
false))
143143
return false;

src/nbl/video/CVulkanLogicalDevice.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1488,12 +1488,12 @@ void CVulkanLogicalDevice::createRayTracingPipelines_impl(
14881488
return {
14891489
.sType = VK_STRUCTURE_TYPE_RAY_TRACING_SHADER_GROUP_CREATE_INFO_KHR,
14901490
.pNext = nullptr,
1491-
.type = group.intersectionShader == SShaderGroupParams::SIndex::Unused ?
1491+
.type = group.intersection == SShaderGroupParams::SIndex::Unused ?
14921492
VK_RAY_TRACING_SHADER_GROUP_TYPE_TRIANGLES_HIT_GROUP_KHR : VK_RAY_TRACING_SHADER_GROUP_TYPE_PROCEDURAL_HIT_GROUP_KHR,
14931493
.generalShader = VK_SHADER_UNUSED_KHR,
14941494
.closestHitShader = getVkShaderIndex(group.closestHit),
14951495
.anyHitShader = getVkShaderIndex(group.anyHit),
1496-
.intersectionShader = getVkShaderIndex(group.intersectionShader),
1496+
.intersectionShader = getVkShaderIndex(group.intersection),
14971497
};
14981498
};
14991499
for (const auto& info : createInfos)

0 commit comments

Comments
 (0)