fix: no GPU allocation path maps, however small the buffer

The previous commit converted the allocations that scale with the
drawing and deliberately left the small fixed-size ones -- uniforms, the
viewcube's static geometry, per-image and per-wipeout quads -- reasoning
that an allocation failure was not a realistic outcome for a few dozen
bytes.

That reasoning was wrong, and the log says so precisely. On the
reproducer the vertex buffers degraded exactly as intended:

  [gpu] uncaptured ... Out of Memory
  [gpu] uncaptured ... In Queue::write_buffer
          Buffer with 'block_wire.vertices' label is invalid
  ... errors #4 #8 #16 #32 #64 #128, session kept alive

and then the process died here:

  thread 'main' panicked at wgpu_core.rs:2253:
  Error in Buffer::get_mapped_range: Validation Error
  Caused by: Buffer with 'block_wire.const' label is invalid

'block_wire.const' is a single uniform struct. Once the device is out of
memory every allocation fails, including a 32-byte one, and
create_buffer_init maps it and panics. Size was never the relevant
property -- whether the path maps is.

So every remaining allocation goes through gpu_upload too: block-wire
const, the viewcube's seven buffers, the blit and clip-boundary buffers,
image instances/params/vertices, mesh material params and surface and the
empty index stub, the texture-hatch uniform, and all five wipeout
buffers. `grep -r create_buffer_init src` now finds only a comment, and
no mapped_at_creation:true remains outside gpu_upload's own docs.

`queue` is threaded through the last holdouts: upload_wipeouts,
upload_clip_boundary, MeshBatchStubs::new and
create_material_bind_group_from_resources.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
PanosandClaude Opus 5 committed 2026-09-04 16:21:08 +03:00
1 parent 0d11421dea
commit 6747d7125e
8 files changed
+181 -129

No files matched your search

+19 -19
View File
@@ -7,7 +7,6 @@
use crate::scene::model::image_model::ImageModel;
use iced::wgpu;
use iced::wgpu::util::DeviceExt;
use std::sync::Arc;
// ── Vertex ────────────────────────────────────────────────────────────────
@@ -179,24 +178,24 @@ impl ImageGpu {
}
})
.collect();
let instance_buffer = Arc::new(device.create_buffer_init(
&wgpu::util::BufferInitDescriptor {
label: Some("image.instances"),
contents: bytemuck::cast_slice(&instances),
usage: wgpu::BufferUsages::VERTEX,
},
let instance_buffer = Arc::new(super::gpu_upload::upload_buffer(
device,
queue,
"image.instances",
&instances,
wgpu::BufferUsages::VERTEX,
));
let params = ImageParams {
opacity: model.opacity.clamp(0.0, 1.0),
draw_depth: 0.0,
_pad: [0.0; 2],
};
let params_buf = Arc::new(device.create_buffer_init(
&wgpu::util::BufferInitDescriptor {
label: Some("image.params"),
contents: bytemuck::bytes_of(&params),
usage: wgpu::BufferUsages::UNIFORM,
},
let params_buf = Arc::new(super::gpu_upload::upload_buffer(
device,
queue,
"image.params",
std::slice::from_ref(&params),
wgpu::BufferUsages::UNIFORM,
));
let mut output = Vec::with_capacity(x_tiles.len() * y_tiles.len());
@@ -264,12 +263,13 @@ impl ImageGpu {
},
],
});
let vertex_buffer =
device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
label: Some("image.vbuf"),
contents: bytemuck::cast_slice(&verts),
usage: wgpu::BufferUsages::VERTEX,
});
let vertex_buffer = super::gpu_upload::upload_buffer(
device,
queue,
"image.vbuf",
&verts,
wgpu::BufferUsages::VERTEX,
);
output.push(Self {
vertex_buffer,
instance_buffer: Arc::clone(&instance_buffer),