Fix several regressions from recent rendering changes. #16890
Merged
Conversation
This file contains 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
This commit fixes the following regressions: 1. Transmission-specific calls to shader lighting functions didn't pass the `enable_diffuse` parameter, breaking the `transmission` example. 2. The combination of bindless `StandardMaterial` and bindless lightmaps caused us to blow past the 128 texture limit on M1/M2 chips in some cases. gfx-rs/wgpu#3334 should fix this, but in the meantime this patch reduces the number of bindless lightmaps from 16 to 4 in order to stay under the limit. 3. The renderer was crashing on startup on Adreno 610 chips. This PR simply disables bindless on Adreno 610 and lower.
pcwalton
added
A-Rendering
rparrett
reviewed
Dec 19, 2024
|
I've started an example-runner test run for this :) We should expect diffs though. |
rparrett
approved these changes
Dec 19, 2024
There was a problem hiding this comment.
I am not qualified to review most of the rendering changes, but:
- Confirmed that this fixes
depth_of_fieldon my m1 mac - Confirmed that this fixes
transmission - Changes related to Android make sense to me, but I can't test
- Didn't seem to cause any additional problems in the example run (but mobile screenshots are still not running?)
IceSentry
approved these changes
Dec 22, 2024
| @@ -71,7 +72,7 @@ pub const LIGHTMAP_SHADER_HANDLE: Handle<Shader> = | |||
| /// | |||
| /// If bindless textures aren't in use, then only a single lightmap can be bound | |||
| /// at a time. | |||
| pub const LIGHTMAPS_PER_SLAB: usize = 16; | |||
| pub const LIGHTMAPS_PER_SLAB: usize = 4; | |||
There was a problem hiding this comment.
Is there a reason for the 4 specifically or is it just a nice number that happens to still work because it's small enough??
|
I haven't tested anything locally, but the changes LGTM |
IceSentry
added
S-Ready-For-Final-Review
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This commit fixes the following regressions:
Transmission-specific calls to shader lighting functions didn't pass the
enable_diffuseparameter, breaking thetransmissionexample.The combination of bindless
StandardMaterialand bindless lightmaps caused us to blow past the 128 texture limit on M1/M2 chips in some cases, in particular thedepth_of_fieldexample. Use Argument Buffers forbinding_arrayon Metal gfx-rs/wgpu#3334 should fix this, but in the meantime this patch reduces the number of bindless lightmaps from 16 to 4 in order to stay under the limit.The renderer was crashing on startup on Adreno 610 chips. This PR simply disables bindless on Adreno 610 and lower.