update spirv-headers and fix handling of gl_HitTEXT#2471
Merged
johnkslang merged 2 commits intoKhronosGroup:masterfrom Nov 30, 2020
Merged
update spirv-headers and fix handling of gl_HitTEXT#2471johnkslang merged 2 commits intoKhronosGroup:masterfrom
johnkslang merged 2 commits intoKhronosGroup:masterfrom
Conversation
Update spirv-headers known_good to f027d53 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.
This was referenced Nov 28, 2020
They shouldn't existing in the miss stage because there is no object intersected
Contributor
Author
|
This is needed after KhronosGroup/SPIRV-Tools#4040 and should probably be landed as a precursor to KhronosGroup/SPIRV-Tools#4041 |
Contributor
|
Okay. Will like to update SPIRV-Headers first. We should not be seeing individual edits here. Maybe it's really time to stop using a copy. It was needed early on, but now submodule might be better. A submodule can still control which commit is being relied on, but otherwise does all the rest automatically (when defaults are updated to operate recursively). |
Contributor
|
Ah, this was a backward incompatible change to the header. That should like almost never happen. Will again bypass normal process of first copying in the header to glslang. |
dneto0
added a commit
to dneto0/shaderc
that referenced
this pull request
Dec 7, 2020
Incorporate SPIRV-Tools fixes for new terminator instructions in Vulkan raytracing extensions. KhronosGroup/SPIRV-Tools#4050 Incorporate glslang fixes - raytracing: - KhronosGroup/glslang#2471 - Update validator known-good - KhronosGroup/glslang#2473
dneto0
added a commit
to google/shaderc
that referenced
this pull request
Dec 7, 2020
Incorporate SPIRV-Tools fixes for new terminator instructions in Vulkan raytracing extensions. KhronosGroup/SPIRV-Tools#4050 Incorporate glslang fixes - raytracing: - KhronosGroup/glslang#2471 - Update validator known-good - KhronosGroup/glslang#2473
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Update spirv-headers known_good to f027d53
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