Consolidate z_hist into a single buffer#415
Merged
Merged
Conversation
There was a problem hiding this comment.
Pull request overview
This PR consolidates the per-tile Z histogram buffers into a single storage buffer, reducing bind group pressure in the clear.wgsl compute pass and freeing a binding for future storage-buffer needs.
Changes:
- Removed
z_histfromTileBuffersand introduced a unifiedBuffers::z_hist_bufwith explicit padding for binding-offset alignment. - Updated bind groups to bind the appropriate
z_hist_bufsub-slices for the 16³ and 4³ sorting/interval passes. - Updated the clear shader/bindings to clear histogram counters via the consolidated buffer.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 5 comments.
| File | Description |
|---|---|
fidget-wgpu/src/voxel.rs |
Removes per-tile histogram buffers, adds a consolidated histogram buffer, and updates bind groups to use buffer slices. |
fidget-wgpu/src/shaders/clear.wgsl |
Updates bindings and clearing logic to use the consolidated histogram buffer. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
1715
to
+1731
| fn sort16(&self, ctx: &Context, buffers: &Buffers) -> &wgpu::BindGroup { | ||
| self.sort16 | ||
| .get_or_init(|| Self::sort_bind_group(ctx, &buffers.tile16)) | ||
| self.sort16.get_or_init(|| { | ||
| Self::sort_bind_group( | ||
| ctx, | ||
| &buffers.tile16, | ||
| buffers.z_hist_buf.slice(0..16).into(), | ||
| ) | ||
| }) | ||
| } | ||
|
|
||
| fn sort4(&self, ctx: &Context, buffers: &Buffers) -> &wgpu::BindGroup { | ||
| self.sort4 | ||
| .get_or_init(|| Self::sort_bind_group(ctx, &buffers.tile4)) | ||
| self.sort4.get_or_init(|| { | ||
| Self::sort_bind_group( | ||
| ctx, | ||
| &buffers.tile4, | ||
| buffers.z_hist_buf.slice(256..320).into(), | ||
| ) |
Comment on lines
+3
to
+5
| @group(1) @binding(2) var<storage, read_write> tile4_count: array<u32, 4>; | ||
| @group(1) @binding(3) var<storage, read_write> tile4_sort: array<u32, 4>; | ||
| @group(1) @binding(4) var<storage, read_write> zhist_buf: array<u32, 80>; |
mkeeter
force-pushed
the
consolidate-z-hist
branch
from
7a2309e to
b192c65
Compare
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
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 frees up a buffer binding in the
clear.wgslpass, so we can add an additional storage buffer for variables.