Skip to content

fix: avoid camera_params redefinition in pickPS (WGSL)#8641

Merged
mvaligursky merged 1 commit into
mainfrom
fix/camera_params-redefinition-pickPS-wgsl
Apr 23, 2026
Merged

fix: avoid camera_params redefinition in pickPS (WGSL)#8641
mvaligursky merged 1 commit into
mainfrom
fix/camera_params-redefinition-pickPS-wgsl

Conversation

@mvaligursky
Copy link
Copy Markdown
Contributor

Description

This PR mirrors the fix from #8640 for the WGSL version of the pickPS chunk. It adds a CAMERAPLANES include guard around the camera_params uniform in src/scene/shader-lib/wgsl/chunks/common/frag/pick.js, preventing duplicate definition errors when multiple shader chunks that declare camera_params are included together.

The pattern matches the existing guard used in other WGSL chunks (linearizeDepth, screenDepth, particle, particle_init) and is now consistent with the GLSL version fixed in #8640.

Checklist

  • I have read the contributing guidelines
  • My code follows the project's coding standards
  • This PR focuses on a single change

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).
@mvaligursky mvaligursky self-assigned this Apr 23, 2026
@mvaligursky mvaligursky added the area: graphics Graphics related issue label Apr 23, 2026
@mvaligursky mvaligursky merged commit 3c98bda into main Apr 23, 2026
8 checks passed
@mvaligursky mvaligursky deleted the fix/camera_params-redefinition-pickPS-wgsl branch April 23, 2026 08:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area: graphics Graphics related issue

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant