Add missing members to ShaderGlobals in rend_lib.h #1721
Merged
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.
Description
There is a separate definition of
ShaderGlobals
intestrender/cuda/rend_lib.h
that has drifted away from the definition ininclude/OSL/shaderglobals.h
. Two new members were added in #1702 which changed the byte offset of the output closureCi
, which leads to incorrect shader output since the offset is baked into the PTX.Adding the new members fixes the shading issue. But this should be regarded as a short-term fix, since the two
ShaderGlobals
definitions have diverged in other ways that might be significant.Tests
All OptiX tests passing with the exception of
testoptix.optix.opt
, which is a preexisting failure.Checklist: