[Merged by Bors] - adjust cluster index for viewport origin #5947
Conversation
jakobhellermann
added
C-Bug
There was a problem hiding this comment.
I can confirm that this fixes #5946. I don't know much about the implementation so I can't check whether this is the only place where frag_coord needs to be adjusted, but everything seems to work in practice.
|
i've left the 2d view analog untouched since we don't use frag_coord there. do we want to update that too? |
|
answering my own question, yes we need to update 2d since they source from the same rust-side Uniform struct (there's a separate PR to make 2d use the same wgsl view definition that would have naturally fixed this anyway). also added a util to convert @Builtin(position) to viewport uv since |
| width: f32, | ||
| height: f32, | ||
| // viewport(x_origin, y_origin, width, height) | ||
| viewport: vec4<f32>, |
There was a problem hiding this comment.
could you import from bevy_sprite::mesh2d_view_types instead of redefining it here?
There was a problem hiding this comment.
Or maybe it should really be a shader imports defined in bevy_render and imported everywhere else…
There was a problem hiding this comment.
this is done in #5535
| width: f32, | ||
| height: f32, | ||
| // viewport(x_origin, y_origin, width, height) | ||
| viewport: vec4<f32>, |
| width: f32, | ||
| height: f32, | ||
| // viewport(x_origin, y_origin, width, height) | ||
| viewport: vec4<f32>, |
There was a problem hiding this comment.
Or maybe it should really be a shader imports defined in bevy_render and imported everywhere else…
# Objective fixes #5946 ## Solution adjust cluster index calculation for viewport origin. from reading point 2 of the rasterization algorithm description in https://gpuweb.github.io/gpuweb/#rasterization, it looks like framebuffer space (and so @bulitin(position)) is not meant to be adjusted for viewport origin, so we need to subtract that to get the right cluster index. - add viewport origin to rust `ExtractedView` and wgsl `View` structs - subtract from frag coord for cluster index calculation
|
Pull request successfully merged into main. Build succeeded: |
bors
bot
changed the title
# Objective fixes bevyengine#5946 ## Solution adjust cluster index calculation for viewport origin. from reading point 2 of the rasterization algorithm description in https://gpuweb.github.io/gpuweb/#rasterization, it looks like framebuffer space (and so @bulitin(position)) is not meant to be adjusted for viewport origin, so we need to subtract that to get the right cluster index. - add viewport origin to rust `ExtractedView` and wgsl `View` structs - subtract from frag coord for cluster index calculation
# Objective fixes bevyengine#5946 ## Solution adjust cluster index calculation for viewport origin. from reading point 2 of the rasterization algorithm description in https://gpuweb.github.io/gpuweb/#rasterization, it looks like framebuffer space (and so @bulitin(position)) is not meant to be adjusted for viewport origin, so we need to subtract that to get the right cluster index. - add viewport origin to rust `ExtractedView` and wgsl `View` structs - subtract from frag coord for cluster index calculation
# Objective fixes bevyengine#5946 ## Solution adjust cluster index calculation for viewport origin. from reading point 2 of the rasterization algorithm description in https://gpuweb.github.io/gpuweb/#rasterization, it looks like framebuffer space (and so @bulitin(position)) is not meant to be adjusted for viewport origin, so we need to subtract that to get the right cluster index. - add viewport origin to rust `ExtractedView` and wgsl `View` structs - subtract from frag coord for cluster index calculation
Objective
fixes #5946
Solution
adjust cluster index calculation for viewport origin.
from reading point 2 of the rasterization algorithm description in https://gpuweb.github.io/gpuweb/#rasterization, it looks like framebuffer space (and so @bulitin(position)) is not meant to be adjusted for viewport origin, so we need to subtract that to get the right cluster index.
ExtractedViewand wgslViewstructs