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.

Sign up for GitHub

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

Jump to bottom

Force all adapters to report min buffer alignment of 32 #3262

Merged
merged 4 commits into from
Dec 21, 2022
Merged

Force all adapters to report min buffer alignment of 32 #3262

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7539be9
add changelog entry
Wumpf Dec 5, 2022
b787007
force wgpu core adapater to report min_uniform_buffer_offset_alignmen…
Wumpf Dec 17, 2022
dd7a5ea
Merge remote-tracking branch 'upstream/master' into fix-buffer-alignm…
Wumpf Dec 21, 2022
8e5a635
fix confusion about min/max with MIN_BUFFER_OFFSET_ALIGNMENT_LOWER_BOUND
Wumpf Dec 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ Additionally `Surface::get_default_config` now returns an Option and returns Non
- Combine `Surface::get_supported_formats`, `Surface::get_supported_present_modes`, and `Surface::get_supported_alpha_modes` into `Surface::get_capabilities` and `SurfaceCapabilities`. By @cwfitzgerald in [#3157](https://github.com/gfx-rs/wgpu/pull/3157)
- Make `Surface::get_default_config` return an Option to prevent panics. By @cwfitzgerald in [#3157](https://github.com/gfx-rs/wgpu/pull/3157)
- Lower the `max_buffer_size` limit value for compatibility with Apple2 and WebGPU compliance. By @jinleili in [#3255](https://github.com/gfx-rs/wgpu/pull/3255)
- Limits `min_uniform_buffer_offset_alignment` and `min_storage_buffer_offset_alignment` is now always at least 32. By @wumpf [#3262](https://github.com/gfx-rs/wgpu/pull/3262)
- Dereferencing a buffer view is now marked inline. By @Wumpf in [#3307](https://github.com/gfx-rs/wgpu/pull/3307)
- The `strict_assert` family of macros was moved to `wgpu-types`. By @i509VCB in [#3051](https://github.com/gfx-rs/wgpu/pull/3051)
- Add missing `DEPTH_BIAS_CLAMP` and `FULL_DRAW_INDEX_UINT32` downlevel flags. By @teoxoy in [#3316](https://github.com/gfx-rs/wgpu/pull/3316)
Expand Down
14 changes: 13 additions & 1 deletion wgpu-core/src/instance.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,19 @@ pub struct Adapter<A: hal::Api> {
}

impl<A: HalApi> Adapter<A> {
fn new(raw: hal::ExposedAdapter<A>) -> Self {
fn new(mut raw: hal::ExposedAdapter<A>) -> Self {
// WebGPU requires this offset alignment as lower bound on all adapters.
const MIN_BUFFER_OFFSET_ALIGNMENT_LOWER_BOUND: u32 = 32;

let limits = &mut raw.capabilities.limits;

limits.min_uniform_buffer_offset_alignment = limits
.min_uniform_buffer_offset_alignment
.min(MIN_BUFFER_OFFSET_ALIGNMENT_LOWER_BOUND);
Wumpf marked this conversation as resolved.
Show resolved Hide resolved
limits.min_storage_buffer_offset_alignment = limits
.min_storage_buffer_offset_alignment
.min(MIN_BUFFER_OFFSET_ALIGNMENT_LOWER_BOUND);

Self {
raw,
life_guard: LifeGuard::new("<Adapter>"),
Expand Down