From fb29281b9061eb5e9b75d1362f2c824d01a8b3d4 Mon Sep 17 00:00:00 2001 From: Robert Stepinski Date: Wed, 20 Mar 2019 17:13:48 -0400 Subject: Add support for scalar rcp() intrinsic for GLSL (#918) --- tests/bugs/vk-structured-buffer-load.hlsl | 12 ++++++++++-- tests/bugs/vk-structured-buffer-load.hlsl.glsl | 20 ++++++++++++++++++-- 2 files changed, 28 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/bugs/vk-structured-buffer-load.hlsl b/tests/bugs/vk-structured-buffer-load.hlsl index daedc5b66..a5f518f93 100644 --- a/tests/bugs/vk-structured-buffer-load.hlsl +++ b/tests/bugs/vk-structured-buffer-load.hlsl @@ -1,5 +1,7 @@ //TEST:CROSS_COMPILE: -profile lib_6_3 -entry HitMain -stage closesthit -target spirv-assembly +#define USE_RCP 0 + struct ParameterBlockTest { SamplerState sam; @@ -19,7 +21,13 @@ void HitMain(inout RayHitInfoPacked RayData, BuiltInTriangleIntersectionAttribut float HitT = RayTCurrent(); RayData.PackedHitInfoA.x = HitT; uint offs = 0; + uint use_rcp = USE_RCP; float offsfloat = gParamBlock.sbuf.Load(offs); - - RayData.PackedHitInfoA.y = rsqrt(offsfloat); + + use_rcp |= HitT > 0.0; + + if (use_rcp) + RayData.PackedHitInfoA.y = rcp(offsfloat); + else + RayData.PackedHitInfoA.y = rsqrt(offsfloat); } diff --git a/tests/bugs/vk-structured-buffer-load.hlsl.glsl b/tests/bugs/vk-structured-buffer-load.hlsl.glsl index 8060cc921..1cf0b00a7 100644 --- a/tests/bugs/vk-structured-buffer-load.hlsl.glsl +++ b/tests/bugs/vk-structured-buffer-load.hlsl.glsl @@ -29,11 +29,27 @@ void main() float HitT_0 = (gl_HitTNV); _S2.PackedHitInfoA_0.x = HitT_0; + const uint use_rcp_0 = uint(0); + float offsfloat_0 = ((gParamBlock_sbuf_0)._data[(int(uint(0)))]); - float _S4 = inversesqrt(offsfloat_0); - _S2.PackedHitInfoA_0.y = _S4; + + if(bool(use_rcp_0 | uint(HitT_0 > 0.00000000000000000000))) + { + + float _S4 = (1.0/((offsfloat_0))); + + _S2.PackedHitInfoA_0.y = _S4; + + } + else + { + float _S5 = (inversesqrt((offsfloat_0))); + + _S2.PackedHitInfoA_0.y = _S5; + + } return; } -- cgit v1.2.3