From d85b940b72c01a7da009b4f456803a98cd5733bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tur=C3=A1nszki=20J=C3=A1nos?= Date: Thu, 29 Jan 2026 15:05:50 +0100 Subject: [PATCH] spirv syntax workaround --- WickedEngine/shaders/globals.hlsli | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/WickedEngine/shaders/globals.hlsli b/WickedEngine/shaders/globals.hlsli index 8d8205766..a95f8c3ec 100644 --- a/WickedEngine/shaders/globals.hlsli +++ b/WickedEngine/shaders/globals.hlsli @@ -337,12 +337,12 @@ SamplerComparisonState sampler_cmp_depth : register(s109); template struct BindlessResource { - T operator[](uint index) { return T(ResourceDescriptorHeap[index]); } + T operator[](uint index) { return (T)ResourceDescriptorHeap[index]; } }; template<> struct BindlessResource { - SamplerState operator[](uint index) { return SamplerState(SamplerDescriptorHeap[index]); } + SamplerState operator[](uint index) { return (SamplerState)SamplerDescriptorHeap[index]; } }; #endif // defined(__hlsl_dx_compiler) && __SHADER_TARGET_MAJOR >= 6 && __SHADER_TARGET_MINOR >= 6 @@ -394,13 +394,9 @@ static const BindlessResource > bindless_rwtextures_uint2; static const BindlessResource > bindless_rwtextures_uint3; static const BindlessResource > bindless_rwtextures_uint4; -#ifdef RTAPI -#ifdef __spirv__ -[[vk::binding(0, 1)]] RaytracingAccelerationStructure bindless_accelerationstructures[]; -#elif defined(__hlsl_dx_compiler) +#if defined(RTAPI) && defined(__hlsl_dx_compiler) static const BindlessResource bindless_accelerationstructures; -#endif // __hlsl_dx_compiler -#endif // RTAPI +#endif // defined(RTAPI) && defined(__hlsl_dx_compiler) #else SamplerState bindless_samplers[] : register(space1);