Skip to content

vello_hybrid: Reject unsupported and unknown images #1772

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
LaurenzV merged 2 commits into from
Jul 29, 2026
+16 −16
Merged

vello_hybrid: Reject unsupported and unknown images #1772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c3b87c
.
LaurenzV Jul 28, 2026
2e5e51b
Reformat
LaurenzV Jul 28, 2026
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
16 changes: 8 additions & 8 deletions sparse_strips/vello_hybrid/src/render/webgl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,14 +651,14 @@ impl WebGlRenderer {
self.paint_idxs[encoded_paint_idx] = current_idx;
match paint {
EncodedPaint::Image(img) => {
if let ImageSource::OpaqueId { id: image_id, .. } = img.source {
let image_resource: Option<&ImageResource> = image_cache.get(image_id);
if let Some(image_resource) = image_resource {
let gpu_image = self.encode_image_paint(img, image_resource);
self.encoded_paints[encoded_paint_idx] = gpu_image;
current_idx += GPU_ENCODED_IMAGE_SIZE_TEXELS;
}
}
let ImageSource::OpaqueId { id: image_id, .. } = img.source else {
panic!("pixmap image sources are not supported by Vello Hybrid");
};

let image_resource = image_cache.get(image_id).unwrap();
let gpu_image = self.encode_image_paint(img, image_resource);
self.encoded_paints[encoded_paint_idx] = gpu_image;
current_idx += GPU_ENCODED_IMAGE_SIZE_TEXELS;
}
EncodedPaint::Gradient(gradient) => {
let (gradient_start, gradient_width) =
Expand Down
16 changes: 8 additions & 8 deletions sparse_strips/vello_hybrid/src/render/wgpu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,14 +690,14 @@ impl Renderer {
self.paint_idxs[encoded_paint_idx] = current_idx;
match paint {
EncodedPaint::Image(img) => {
if let ImageSource::OpaqueId { id: image_id, .. } = img.source {
let image_resource: Option<&ImageResource> = image_cache.get(image_id);
if let Some(image_resource) = image_resource {
let image_paint = self.encode_image_paint(img, image_resource);
self.encoded_paints[encoded_paint_idx] = image_paint;
current_idx += GPU_ENCODED_IMAGE_SIZE_TEXELS;
}
}
let ImageSource::OpaqueId { id: image_id, .. } = img.source else {
panic!("pixmap image sources are not supported by Vello Hybrid");
};

let image_resource = image_cache.get(image_id).unwrap();
let image_paint = self.encode_image_paint(img, image_resource);
self.encoded_paints[encoded_paint_idx] = image_paint;
current_idx += GPU_ENCODED_IMAGE_SIZE_TEXELS;
}
EncodedPaint::ExternalTexture(img) => {
if texture_bindings.get(img.texture_id).is_none() {
Expand Down
Loading