Skip to content

Correctly check cpu data size not just descriptor. #22612

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

Merged
alice-i-cecile merged 1 commit into from
Jan 21, 2026
Merged

Correctly check cpu data size not just descriptor. #22612

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 15 additions & 2 deletions crates/bevy_render/src/storage.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,18 @@ impl RenderAsset for GpuShaderBuffer {
) -> Result<Self, PrepareAssetError<Self::SourceAsset>> {
let had_data = source_asset.data.is_some();

// when cpu data is provided, the actual buffer size is determined by the vec length,
// not the descriptor size
let actual_size = source_asset
.data
.as_ref()
.map(|d| d.len() as u64)
.unwrap_or(source_asset.buffer_description.size);

let buffer = if let Some(prev) = previous_asset
&& prev.buffer_descriptor == source_asset.buffer_description
&& prev.buffer_descriptor.size == actual_size
&& prev.buffer_descriptor.usage == source_asset.buffer_description.usage
&& prev.buffer_descriptor.label == source_asset.buffer_description.label
&& source_asset
.buffer_description
.usage
Expand Down Expand Up @@ -210,7 +220,10 @@ impl RenderAsset for GpuShaderBuffer {

Ok(GpuShaderBuffer {
buffer,
buffer_descriptor: source_asset.buffer_description,
buffer_descriptor: wgpu::BufferDescriptor {
size: actual_size,
..source_asset.buffer_description
},
had_data,
})
}
Expand Down