Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix WebGL mode for Adreno GPUs #8508

Merged
merged 3 commits into from
Jun 29, 2023
Merged

Fix WebGL mode for Adreno GPUs #8508

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4d9b00f
Fixes bug where shader crashes on Adreno GPUs using WebGL
TotalKrill Apr 28, 2023
1cb1d0d
Merge remote-tracking branch 'origin/main' into pr/TotalKrill/8508
cart Jun 29, 2023
3943a51
Update crates/bevy_pbr/src/render/light.rs
cart Jun 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions crates/bevy_pbr/src/render/light.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,12 @@ pub struct GpuLights {

// NOTE: this must be kept in sync with the same constants in pbr.frag
pub const MAX_UNIFORM_BUFFER_POINT_LIGHTS: usize = 256;

//NOTE: When running bevy on Adreno GPU chipsets in WebGL, any value above 1 will result in a crash
// when loading the wgsl "pbr_functions.wgsl" in the function apply_fog.
#[cfg(feature = "webgl")]
pub const MAX_DIRECTIONAL_LIGHTS: usize = 1;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, is this the case for all WebGL2? Or just with some Adreno GPU drivers?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Its actually only the case for Adreno GPU drivers, but I am not sure how to address that.

Copy link
Contributor

@Elabajaba Elabajaba Apr 28, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think it's possible if we're using a const here, since you have to query the gpu driver at runtime.

edit: Also, is this for all Adreno GPUs, or only certain ones? Do you know if it's an issue on just Android, or does it also impact Linux?

edit2: I should've read the linked issues first...

#[cfg(not(feature = "webgl"))]
cart marked this conversation as resolved.
Show resolved Hide resolved
pub const MAX_DIRECTIONAL_LIGHTS: usize = 10;
#[cfg(any(not(feature = "webgl"), not(target_arch = "wasm32")))]
pub const MAX_CASCADES_PER_LIGHT: usize = 4;
Expand Down