djkato/egui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

egui-wgpu: Fix crash on zero-sized scissor rects (#2039)

Browse source
This commit is contained in:
Emil Ernerfeldt 2022-09-13 09:32:05 +02:00 committed by GitHub
parent 2842d390c9
commit c5495d69fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
crates/eframe/src/epi.rs
View file

@ -74,7 +74,13 @@ pub trait App {
/// Can be used from web to interact or other external context /// Can be used from web to interact or other external context
/// Implementation is needed, because downcasting Box<dyn App> -> Box<dyn Any> to get &ConcreteApp is not simple in current rust. /// Implementation is needed, because downcasting Box<dyn App> -> Box<dyn Any> to get &ConcreteApp is not simple in current rust.
/// ///
/// Just return &mut *self /// Just copy-paste this as your implementation:
/// ```ignore
/// #[cfg(target_arch = "wasm32")]
/// fn as_any_mut(&mut self) -> &mut dyn std::any::Any {
/// &mut *self
/// }
/// ```
#[cfg(target_arch = "wasm32")] #[cfg(target_arch = "wasm32")]
fn as_any_mut(&mut self) -> &mut dyn Any; fn as_any_mut(&mut self) -> &mut dyn Any;

15
crates/egui-wgpu/src/renderer.rs
View file

@ -2,7 +2,7 @@
use std::{borrow::Cow, collections::HashMap, num::NonZeroU32}; use std::{borrow::Cow, collections::HashMap, num::NonZeroU32};
use egui::{epaint::Primitive, NumExt, PaintCallbackInfo}; use egui::{epaint::Primitive, PaintCallbackInfo};
use type_map::concurrent::TypeMap; use type_map::concurrent::TypeMap;
use wgpu; use wgpu;
use wgpu::util::DeviceExt as _; use wgpu::util::DeviceExt as _;
@ -405,9 +405,9 @@ impl Renderer {
let rect = ScissorRect::new(clip_rect, pixels_per_point, size_in_pixels); let rect = ScissorRect::new(clip_rect, pixels_per_point, size_in_pixels);
if rect.width == 0 || rect.height == 0 { if rect.width == 0 || rect.height == 0 {
// Skip rendering with zero-sized clip areas. // Skip rendering zero-sized clip areas.
if let Primitive::Mesh(_) = primitive { if let Primitive::Mesh(_) = primitive {
// If this is a mesh, we need to advance the index and vertex buffer iterators // If this is a mesh, we need to advance the index and vertex buffer iterators:
index_buffers.next().unwrap(); index_buffers.next().unwrap();
vertex_buffers.next().unwrap(); vertex_buffers.next().unwrap();
} }
@ -906,14 +906,11 @@ impl ScissorRect {
let clip_max_x = clip_max_x.clamp(clip_min_x, target_size[0]); let clip_max_x = clip_max_x.clamp(clip_min_x, target_size[0]);
let clip_max_y = clip_max_y.clamp(clip_min_y, target_size[1]); let clip_max_y = clip_max_y.clamp(clip_min_y, target_size[1]);
let width = (clip_max_x - clip_min_x).at_least(1); Self {
let height = (clip_max_y - clip_min_y).at_least(1);
ScissorRect {
x: clip_min_x, x: clip_min_x,
y: clip_min_y, y: clip_min_y,
width, width: clip_max_x - clip_min_x,
height, height: clip_max_y - clip_min_y,
} }
} }
} }