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.

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 GL Push Constant Layout #4607

Merged
merged 10 commits into from
Nov 6, 2023
Merged

Conversation

cwfitzgerald
Copy link
Member

@cwfitzgerald cwfitzgerald commented Oct 29, 2023

Checklist

  • Run cargo clippy.
  • Run cargo clippy --target wasm32-unknown-unknown if applicable.
  • Add change to CHANGELOG.md. See simple instructions inside file.

Connections

Closes #3375
Closes #3822

Description

We had multiple issues with the push constant layout algorithm. OpenGL's DCE of uniforms easily threw it off.

This completely reworks how we assert the locations of things, and improves our ability to upload the uniforms.

Depends on grovesNL/glow#265

Testing

It is tested!

@cwfitzgerald cwfitzgerald marked this pull request as ready for review October 29, 2023 20:30
@cwfitzgerald cwfitzgerald requested review from a team as code owners October 29, 2023 20:30
Copy link
Member

@teoxoy teoxoy left a comment

Choose a reason for hiding this comment

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

Good stuff! Left a few suggestions.

wgpu-hal/src/gles/conv.rs Outdated Show resolved Hide resolved
naga/src/back/glsl/mod.rs Outdated Show resolved Hide resolved
wgpu-hal/src/gles/command.rs Outdated Show resolved Hide resolved
wgpu-hal/src/gles/mod.rs Outdated Show resolved Hide resolved
@teoxoy
Copy link
Member

teoxoy commented Nov 6, 2023

Can't merge, there seem to be some conflicts now.

@cwfitzgerald cwfitzgerald merged commit 7f72c9f into gfx-rs:trunk Nov 6, 2023
27 checks passed
@cwfitzgerald
Copy link
Member Author

Weird, I could merge from my phone

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

DX12 Push Constant out of bound push_constant_input test fails on GL backend
2 participants