Skip to content
Merged
Changes from all commits
Commits
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
44 changes: 42 additions & 2 deletions crates/renderling/src/atlas/cpu.rs
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,11 @@ impl Atlas {
usage: usage
| wgpu::TextureUsages::TEXTURE_BINDING
| wgpu::TextureUsages::COPY_DST
| wgpu::TextureUsages::COPY_SRC,
| wgpu::TextureUsages::COPY_SRC
// The blitting operation (`AtlasBlittingOperation::run`) renders
// directly into atlas frames (see `update_textures`), so the
// atlas texture must be usable as a render target.
| wgpu::TextureUsages::RENDER_ATTACHMENT,
view_formats: &[],
});

Expand Down Expand Up @@ -1145,7 +1149,7 @@ impl AtlasBlitter {
#[cfg(test)]
mod test {
use crate::{
atlas::{shader::AtlasTextureDescriptor, TextureAddressMode},
atlas::{shader::AtlasTextureDescriptor, AtlasImageFormat, TextureAddressMode},
context::Context,
geometry::Vertex,
material::Materials,
Expand Down Expand Up @@ -1441,6 +1445,42 @@ mod test {
img_diff::assert_img_eq("atlas/array1.png", img);
}

#[test]
// Regression test for https://github.com/schell/renderling/issues/246
//
// `Atlas::update_image` panicked with a wgpu validation error because
// the atlas texture array lacked the RENDER_ATTACHMENT usage required
// by the blitting render pass.
fn update_image_regression_246() {
let ctx = Context::headless(100, 100)
.block()
.with_default_atlas_texture_size(UVec3::new(512, 512, 2));
let stage = ctx.new_stage();
let white = AtlasImage {
pixels: vec![255u8; 256 * 256 * 4],
size: UVec2::new(256, 256),
format: AtlasImageFormat::R8G8B8A8,
apply_linear_transfer: false,
};
let texture = &stage.add_images([white]).unwrap()[0];

let gray = AtlasImage {
pixels: [64u8, 64, 64, 255].repeat(256 * 256),
size: UVec2::new(256, 256),
format: AtlasImageFormat::R8G8B8A8,
apply_linear_transfer: false,
};
let materials: &Materials = stage.as_ref();
materials.atlas().update_image(texture, gray).unwrap();

// No panic: read back the frame and check the blit actually landed.
let desc = texture.descriptor();
let img = materials.atlas().atlas_img(&ctx, desc.layer_index).block();
let pixel = img.get_pixel(desc.offset_px.x + 10, desc.offset_px.y + 10);
let [r, g, b, a] = pixel.0;
assert_eq!((64, 64, 64, 255), (r, g, b, a));
}

#[test]
fn upkeep_trims_the_atlas() {
// tests that Atlas::upkeep trims out unused images and repacks the atlas
Expand Down
Loading