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/core.meta.slang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/slang/core.meta.slang') diff --git a/source/slang/core.meta.slang b/source/slang/core.meta.slang index c3e41b8fc..de83eac73 100644 --- a/source/slang/core.meta.slang +++ b/source/slang/core.meta.slang @@ -2129,10 +2129,10 @@ attribute_syntax [numthreads(x: int, y: int = 1, z: int = 1)] : NumThreadsAttr // __attributeTarget(VarDeclBase) -attribute_syntax [__vulkanRayPayload] : VulkanRayPayloadAttribute; +attribute_syntax [__vulkanRayPayload(location : int = -1)] : VulkanRayPayloadAttribute; __attributeTarget(VarDeclBase) -attribute_syntax [__vulkanCallablePayload] : VulkanCallablePayloadAttribute; +attribute_syntax [__vulkanCallablePayload(location : int = -1)] : VulkanCallablePayloadAttribute; __attributeTarget(VarDeclBase) attribute_syntax [__vulkanHitAttributes] : VulkanHitAttributesAttribute; -- cgit v1.2.3