fix: avoid camera_params redefinition in pickPS#8640
Merged
mvaligursky merged 1 commit intoApr 23, 2026
Conversation
3 tasks
mvaligursky
added a commit
that referenced
this pull request
Apr 23, 2026
Adds a CAMERAPLANES include guard around the camera_params uniform in the WGSL pickPS chunk, mirroring the fix applied to the GLSL version in #8640. Prevents duplicate definition errors when combined with other chunks that declare camera_params (e.g. linearizeDepth, screenDepth). Co-authored-by: Martin Valigursky <mvaligursky@snapchat.com>
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.
Description
This PR adds a
CAMERAPLANESinclude guard around thecamera_paramsuniform inpickPS.glsl, preventing duplicate definition errors when multiple shader chunks that declarecamera_paramsare included together.The pattern matches the existing guard used in other engine shaders (e.g. depthPS.glsl).
Checklist