Make StandardMaterial bindless.#16644
Merged
alice-i-cecile merged 7 commits intobevyengine:mainfrom Dec 10, 2024
Merged
Conversation
This commit makes `StandardMaterial` use bindless textures, as implemented in PR bevyengine#16368. Non-bindless mode, as used for example in Metal and WebGL 2, remains fully supported via a plethora of `#ifdef BINDLESS` preprocessor definitions. Unfortunately, this PR introduces quite a bit of unsightliness into the PBR shaders. This is a result of the fact that WGSL supports neither passing binding arrays to functions nor passing individual *elements* of binding arrays to functions, except directly to texture sample functions. Thus we're unable to use the `sample_texture` abstraction that helped abstract over the meshlet and non-meshlet paths. I don't think there's anything we can do to help this other than to suggest improvements to upstream Naga.
pcwalton
added
C-Performance
JMS55
approved these changes
Dec 5, 2024
Contributor
JMS55
left a comment
JMS55
left a comment
There was a problem hiding this comment.
Oh boy, absolutely terrible code 😅. We are unlikely to get any improvements to this in naga anytime soon afaik. I think we might want to look into writing a simple macro in naga_oil or bevy for texture sampling.
Contributor
Author
|
Yeah, I'd love a macro in |
kristoff3r
approved these changes
Dec 7, 2024
Contributor
kristoff3r
left a comment
kristoff3r
left a comment
There was a problem hiding this comment.
My eyes might have glazed over at some point, but looks correct and tested pbr example on linux+webgl2.
I agree we need macros or similar very soon, the pbr shaders weren't pretty before but they're getting borderline unreadable except for mechanical changes like this.
pcwalton
added
S-Ready-For-Final-Review
Member
|
Testing this via an example run then merging. I'm not pleased with the reduced clarity of the shaders, but I agree that this is not the place to solve it (nor should this be blocked on that). |
Contributor
Author
|
Example run is green. |
github-merge-queue bot
pushed a commit
that referenced
this pull request
Dec 10, 2024
This commit makes `StandardMaterial` use bindless textures, as implemented in PR #16368. Non-bindless mode, as used for example in Metal and WebGL 2, remains fully supported via a plethora of `#ifdef BINDLESS` preprocessor definitions. Unfortunately, this PR introduces quite a bit of unsightliness into the PBR shaders. This is a result of the fact that WGSL supports neither passing binding arrays to functions nor passing individual *elements* of binding arrays to functions, except directly to texture sample functions. Thus we're unable to use the `sample_texture` abstraction that helped abstract over the meshlet and non-meshlet paths. I don't think there's anything we can do to help this other than to suggest improvements to upstream Naga.
Contributor
|
The example run completed successfully, but shows differences in https://pixel-eagle.com/project/B25A040A-A980-4602-B90C-D480AB84076D?filter=PR-16644 The volumetric fog stuff looks like it's just the branch being slightly stale + #16677 I don't know about |
BD103
pushed a commit
to BD103/bevy
that referenced
this pull request
Dec 10, 2024
This commit makes `StandardMaterial` use bindless textures, as implemented in PR bevyengine#16368. Non-bindless mode, as used for example in Metal and WebGL 2, remains fully supported via a plethora of `#ifdef BINDLESS` preprocessor definitions. Unfortunately, this PR introduces quite a bit of unsightliness into the PBR shaders. This is a result of the fact that WGSL supports neither passing binding arrays to functions nor passing individual *elements* of binding arrays to functions, except directly to texture sample functions. Thus we're unable to use the `sample_texture` abstraction that helped abstract over the meshlet and non-meshlet paths. I don't think there's anything we can do to help this other than to suggest improvements to upstream Naga.
ecoskey
pushed a commit
to ecoskey/bevy
that referenced
this pull request
Jan 6, 2025
This commit makes `StandardMaterial` use bindless textures, as implemented in PR bevyengine#16368. Non-bindless mode, as used for example in Metal and WebGL 2, remains fully supported via a plethora of `#ifdef BINDLESS` preprocessor definitions. Unfortunately, this PR introduces quite a bit of unsightliness into the PBR shaders. This is a result of the fact that WGSL supports neither passing binding arrays to functions nor passing individual *elements* of binding arrays to functions, except directly to texture sample functions. Thus we're unable to use the `sample_texture` abstraction that helped abstract over the meshlet and non-meshlet paths. I don't think there's anything we can do to help this other than to suggest improvements to upstream Naga.
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
5 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.
This commit makes
StandardMaterialuse bindless textures, as implemented in PR #16368. Non-bindless mode, as used for example in Metal and WebGL 2, remains fully supported via a plethora of#ifdef BINDLESSpreprocessor definitions.Unfortunately, this PR introduces quite a bit of unsightliness into the PBR shaders. This is a result of the fact that WGSL supports neither passing binding arrays to functions nor passing individual elements of binding arrays to functions, except directly to texture sample functions. Thus we're unable to use the
sample_textureabstraction that helped abstract over the meshlet and non-meshlet paths. I don't think there's anything we can do to help this other than to suggest improvements to upstream Naga.