From 5c6cec4a62e2d83a7c0a95501ee697d39519285c Mon Sep 17 00:00:00 2001 From: Sascha Willems Date: Fri, 24 Mar 2023 20:10:54 +0100 Subject: [PATCH] Fix stb record offset Fixes #1018 --- .../glsl/raytracingshadows/closesthit.rchit | 4 ++-- .../raytracingshadows/closesthit.rchit.spv | Bin 5872 -> 5840 bytes .../hlsl/raytracingshadows/closesthit.rchit | 2 +- .../raytracingshadows/closesthit.rchit.spv | Bin 3940 -> 4032 bytes 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/shaders/glsl/raytracingshadows/closesthit.rchit b/data/shaders/glsl/raytracingshadows/closesthit.rchit index 25079bdf..7026fcab 100644 --- a/data/shaders/glsl/raytracingshadows/closesthit.rchit +++ b/data/shaders/glsl/raytracingshadows/closesthit.rchit @@ -68,8 +68,8 @@ void main() vec3 origin = gl_WorldRayOriginEXT + gl_WorldRayDirectionEXT * gl_HitTEXT; shadowed = true; // Trace shadow ray and offset indices to match shadow hit/miss shader group indices - traceRayEXT(topLevelAS, gl_RayFlagsTerminateOnFirstHitEXT | gl_RayFlagsOpaqueEXT | gl_RayFlagsSkipClosestHitShaderEXT, 0xFF, 1, 0, 1, origin, tmin, lightVector, tmax, 2); + traceRayEXT(topLevelAS, gl_RayFlagsTerminateOnFirstHitEXT | gl_RayFlagsOpaqueEXT | gl_RayFlagsSkipClosestHitShaderEXT, 0xFF, 0, 0, 1, origin, tmin, lightVector, tmax, 2); if (shadowed) { hitValue *= 0.3; } -} +} \ No newline at end of file diff --git a/data/shaders/glsl/raytracingshadows/closesthit.rchit.spv b/data/shaders/glsl/raytracingshadows/closesthit.rchit.spv index 486571c5d0f9613a198f91e214c32b7ecbf86cab..6b84f0a06f166810cd0d4475ba3a4745bbb99ef5 100644 GIT binary patch delta 44 zcmeyMdqJ0znMs+Qft8Vgdn4y=*2z~`HJHwcZ02M8#>B|AnU&L=lTmZCt_`5e5c#1{Q`(P*Em^&F@&h UF)?y(e#&9a$!NS;R%kN|0Pw*M&Hw-a diff --git a/data/shaders/hlsl/raytracingshadows/closesthit.rchit b/data/shaders/hlsl/raytracingshadows/closesthit.rchit index 4408f55c..6dba8bc9 100644 --- a/data/shaders/hlsl/raytracingshadows/closesthit.rchit +++ b/data/shaders/hlsl/raytracingshadows/closesthit.rchit @@ -78,7 +78,7 @@ void main(in InPayload inPayload, inout InOutPayload inOutPayload, in float2 att inOutPayload.shadowed = true; // Offset indices to match shadow hit/miss index - TraceRay(topLevelAS, RAY_FLAG_ACCEPT_FIRST_HIT_AND_END_SEARCH | RAY_FLAG_FORCE_OPAQUE | RAY_FLAG_SKIP_CLOSEST_HIT_SHADER, 0xff, 1, 0, 1, rayDesc, inOutPayload); + TraceRay(topLevelAS, RAY_FLAG_ACCEPT_FIRST_HIT_AND_END_SEARCH | RAY_FLAG_FORCE_OPAQUE | RAY_FLAG_SKIP_CLOSEST_HIT_SHADER, 0xff, 0, 0, 1, rayDesc, inOutPayload); if (inOutPayload.shadowed) { inPayload.hitValue *= 0.3; } diff --git a/data/shaders/hlsl/raytracingshadows/closesthit.rchit.spv b/data/shaders/hlsl/raytracingshadows/closesthit.rchit.spv index 225df9759e12c492e9da6f50a7fcc3af18931b67..983aafe1e48e01e90fa5ac79474532c0ed17924e 100644 GIT binary patch literal 4032 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