From 5ffd3048df2d7faf30ca8192c117d73e908212cd Mon Sep 17 00:00:00 2001 From: Alexey Panteleev Date: Wed, 13 Apr 2022 14:24:58 -0700 Subject: Callable shader fix and explicit payload locations for GLSL (#2185) * Fixed the callable shader payload type for GLSL. * Added location parameters to the __vulkanRayPayload and __vulkanCallablePayload attributes. The default value is -1 which means use the old auto-assignment logic. * Fixed the vkray/callable-caller test. --- source/slang/hlsl.meta.slang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/slang/hlsl.meta.slang') diff --git a/source/slang/hlsl.meta.slang b/source/slang/hlsl.meta.slang index 971efcfcc..e404aa626 100644 --- a/source/slang/hlsl.meta.slang +++ b/source/slang/hlsl.meta.slang @@ -4500,7 +4500,7 @@ __generic __specialized_for_target(glsl) void CallShader(uint shaderIndex, inout Payload payload) { - [__vulkanRayPayload] + [__vulkanCallablePayload] static Payload p; p = payload; -- cgit v1.2.3