mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update spirv-headers and fix handling of gl_HitTEXT (#2471)

Browse Source 
* update spirv-headers and fix handling of gl_HitTEXT

Update spirv-headers known_good to f027d53ded7e230e008d37c8b47ede7cd308e19d
and update SPIRV/spirv.hpp to copy from that version as well.

In GLSL gl_HitTNV/gl_HitTEXT is defined as an alias of gl_RayTmaxNV/gl_RayTmaxEXT
SPV_NV_ray_tracing has a dedicated HitTNV which gl_HitTNV maps to.
For SPV_KHR_ray_tracing, gl_HitTEXT gets mapped to a RayTmaxKHR decoraged variable
to simplify the SPIRV consumer.
This change fixes the mapping for the GL_EXT_ray_tracing extension, and updates
the test results to match.

* update MissNV shader test to not use ObjectRay builtins

They shouldn't existing in the miss stage because there is no object intersected
This commit is contained in:
Daniel Koch
2020-11-30 11:57:34 -05:00
committed by GitHub
parent 4d41da3b81
commit e11a2c8bec
10 changed files with 73 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Test/spv.MissShader.rmiss
View File

@@ -9,8 +9,7 @@ void main()
uvec3 v1 = gl_LaunchSizeNV;
vec3 v2 = gl_WorldRayOriginNV;
vec3 v3 = gl_WorldRayDirectionNV;
vec3 v4 = gl_ObjectRayOriginNV;
vec3 v5 = gl_ObjectRayDirectionNV;
uint v4 = gl_IncomingRayFlagsNV;
float v6 = gl_RayTminNV;
float v7 = gl_RayTmaxNV;
traceNV(accNV, 0u, 1u, 2u, 3u, 0u, vec3(0.5f), 0.5f, vec3(1.0f), 0.75f, 1);