[Merged by Bors] - Fix post_processing and shader_prepass examples #7419

superdump · 2023-01-30T04:45:06Z

Objective

Fix post_processing and shader_prepass examples as they fail when compiling shaders due to missing shader defs
Fixes Importing bevy_pbr::mesh_view_types imples defining MAX_DIRECTIONAL_LIGHTS #6799
Fixes Shaderdef values break shader imports #6996
Fixes shader_prepass example is broken #7375
Supercedes MAX_DIRECTIONAL_LIGHTS must be defined to have the Lights struct #6997
Supercedes make shaders work when MAX_CASCADES_PER_LIGHT is undefined #7380

Solution

The prepass was broken due to a missing MAX_CASCADES_PER_LIGHT shader def. Add it.
The shader used in the post_processing example is applied to a 2D mesh, so use the correct mesh2d_view_bindings shader import.

superdump · 2023-01-30T04:47:57Z

I feel we should make a separate view uniform shader import and use it everywhere as they're all constructed in the same way from the same struct. I also feel like I made a PR doing this a long time ago... maybe.

IceSentry · 2023-01-30T04:59:30Z

I feel we should make a separate view uniform shader import

Yeah, that does seem like a better fix. I originally tried reusing the MeshPipeline::specialize for the prepass, but it didn't work. I don't remember exactly why. It does seem possible to extract the common part to a separate function that could be used in both places.

robtfm

I feel we should make a separate view uniform shader import and use it everywhere as they're all constructed in the same way from the same struct. I also feel like I made a PR doing this a long time ago... maybe.

i've done that at least once too, as part of #6738. also noting this fix would be covered by #5703

rparrett · 2023-01-30T16:23:57Z

This also closes #7375

superdump · 2023-01-30T18:00:40Z

bors r+

# Objective - Fix `post_processing` and `shader_prepass` examples as they fail when compiling shaders due to missing shader defs - Fixes #6799 - Fixes #6996 - Fixes #7375 - Supercedes #6997 - Supercedes #7380 ## Solution - The prepass was broken due to a missing `MAX_CASCADES_PER_LIGHT` shader def. Add it. - The shader used in the `post_processing` example is applied to a 2D mesh, so use the correct mesh2d_view_bindings shader import.

bors · 2023-01-30T18:02:29Z

Build failed:

run-examples-on-wasm

superdump · 2023-01-30T18:10:01Z

bors r+

# Objective - Fix `post_processing` and `shader_prepass` examples as they fail when compiling shaders due to missing shader defs - Fixes #6799 - Fixes #6996 - Fixes #7375 - Supercedes #6997 - Supercedes #7380 ## Solution - The prepass was broken due to a missing `MAX_CASCADES_PER_LIGHT` shader def. Add it. - The shader used in the `post_processing` example is applied to a 2D mesh, so use the correct mesh2d_view_bindings shader import.

bors · 2023-01-30T18:11:22Z

Build failed:

run-examples

superdump · 2023-01-30T21:44:22Z

bors r+

# Objective - Fix `post_processing` and `shader_prepass` examples as they fail when compiling shaders due to missing shader defs - Fixes #6799 - Fixes #6996 - Fixes #7375 - Supercedes #6997 - Supercedes #7380 ## Solution - The prepass was broken due to a missing `MAX_CASCADES_PER_LIGHT` shader def. Add it. - The shader used in the `post_processing` example is applied to a 2D mesh, so use the correct mesh2d_view_bindings shader import.

bors · 2023-01-30T21:46:38Z

Build failed:

markdownlint

superdump · 2023-01-30T21:47:59Z

bors r+

# Objective - Fix `post_processing` and `shader_prepass` examples as they fail when compiling shaders due to missing shader defs - Fixes #6799 - Fixes #6996 - Fixes #7375 - Supercedes #6997 - Supercedes #7380 ## Solution - The prepass was broken due to a missing `MAX_CASCADES_PER_LIGHT` shader def. Add it. - The shader used in the `post_processing` example is applied to a 2D mesh, so use the correct mesh2d_view_bindings shader import.

rparrett · 2023-01-30T21:49:15Z

The failure is real

edit: weird, I was sure that I saw a real error in github action after the first try earlier today.

But anyhow, I'm getting this locally (macos and wasm) in post_processing

ERROR bevy_render::render_resource::pipeline_cache: failed to process shader: Unresolved import: Custom("bevy_pbr::mesh2d_view_bindings").

shader_prepass seems fine

bors · 2023-01-30T21:50:34Z

Build failed:

markdownlint

superdump · 2023-01-30T21:55:03Z

Oh, I saw the markdown lint failure that seemed to just be an intermittent docker issue. I'll fix that.

superdump

bors r+

# Objective - Fix `post_processing` and `shader_prepass` examples as they fail when compiling shaders due to missing shader defs - Fixes #6799 - Fixes #6996 - Fixes #7375 - Supercedes #6997 - Supercedes #7380 ## Solution - The prepass was broken due to a missing `MAX_CASCADES_PER_LIGHT` shader def. Add it. - The shader used in the `post_processing` example is applied to a 2D mesh, so use the correct mesh2d_view_bindings shader import.

bors · 2023-01-30T22:01:10Z

Build failed:

markdownlint

superdump · 2023-01-30T22:52:50Z

bors r+

# Objective - Fix `post_processing` and `shader_prepass` examples as they fail when compiling shaders due to missing shader defs - Fixes #6799 - Fixes #6996 - Fixes #7375 - Supercedes #6997 - Supercedes #7380 ## Solution - The prepass was broken due to a missing `MAX_CASCADES_PER_LIGHT` shader def. Add it. - The shader used in the `post_processing` example is applied to a 2D mesh, so use the correct mesh2d_view_bindings shader import.

bors · 2023-01-30T23:09:30Z

Pull request successfully merged into main.

Build succeeded:

# Objective - Fix `post_processing` and `shader_prepass` examples as they fail when compiling shaders due to missing shader defs - Fixes bevyengine#6799 - Fixes bevyengine#6996 - Fixes bevyengine#7375 - Supercedes bevyengine#6997 - Supercedes bevyengine#7380 ## Solution - The prepass was broken due to a missing `MAX_CASCADES_PER_LIGHT` shader def. Add it. - The shader used in the `post_processing` example is applied to a 2D mesh, so use the correct mesh2d_view_bindings shader import.

Fix post_processing and shader_prepass examples

b673d10

This was referenced Jan 30, 2023

make shaders work when MAX_CASCADES_PER_LIGHT is undefined #7380

Closed

MAX_DIRECTIONAL_LIGHTS must be defined to have the Lights struct #6997

Closed

superdump added this to the 0.10 milestone Jan 30, 2023

superdump added C-Bug An unexpected or incorrect behavior A-Rendering Drawing game state to the screen C-Examples An addition or correction to our examples labels Jan 30, 2023

superdump requested a review from robtfm January 30, 2023 04:46

IceSentry approved these changes Jan 30, 2023

View reviewed changes

robtfm approved these changes Jan 30, 2023

View reviewed changes

mesh2d_view_bindings are in bevy_sprite not bevy_pbr

c061983

superdump commented Jan 30, 2023

View reviewed changes

bors bot changed the title ~~Fix post_processing and shader_prepass examples~~ [Merged by Bors] - Fix post_processing and shader_prepass examples Jan 30, 2023

bors bot closed this Jan 30, 2023

Uh oh!

[Merged by Bors] - Fix post_processing and shader_prepass examples #7419

[Merged by Bors] - Fix post_processing and shader_prepass examples #7419

Uh oh!

Conversation

superdump commented Jan 30, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Objective

Solution

Uh oh!

superdump commented Jan 30, 2023

Uh oh!

IceSentry commented Jan 30, 2023

Uh oh!

robtfm left a comment

Choose a reason for hiding this comment

Uh oh!

rparrett commented Jan 30, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

superdump commented Jan 30, 2023

Uh oh!

bors bot commented Jan 30, 2023

Uh oh!

superdump commented Jan 30, 2023

Uh oh!

bors bot commented Jan 30, 2023

Uh oh!

superdump commented Jan 30, 2023

Uh oh!

bors bot commented Jan 30, 2023

Uh oh!

superdump commented Jan 30, 2023

Uh oh!

rparrett commented Jan 30, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bors bot commented Jan 30, 2023

Uh oh!

superdump commented Jan 30, 2023

Uh oh!

superdump left a comment

Choose a reason for hiding this comment

Uh oh!

bors bot commented Jan 30, 2023

Uh oh!

superdump commented Jan 30, 2023

Uh oh!

bors bot commented Jan 30, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

superdump commented Jan 30, 2023 •

edited

Loading

rparrett commented Jan 30, 2023 •

edited

Loading

rparrett commented Jan 30, 2023 •

edited

Loading