migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-08-30 13:20:05 -04:00
Code Activity

Improve error message on bad texture allocation

Browse Source 
Fixes https://github.com/emilk/egui/issues/592
This commit is contained in:
Emil Ernerfeldt
2021-07-29 22:20:22 +02:00
parent a1c5ce05f7
commit 784bac53f1
3 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
egui_web/src/webgl1.rs
View File

@@ -107,7 +107,11 @@ impl WebGlPainter {
srgba_pixels: &[Color32],
) -> egui::TextureId {
let index = self.alloc_user_texture_index();
assert_eq!(size.0 * size.1, srgba_pixels.len());
assert_eq!(
size.0 * size.1,
srgba_pixels.len(),
"Mismatch between texture size and texel count"
);
if let Some(Some(user_texture)) = self.user_textures.get_mut(index) {
let mut pixels: Vec<u8> = Vec::with_capacity(srgba_pixels.len() * 4);
@@ -136,6 +140,7 @@ impl WebGlPainter {
}
}
}
pub fn get_texture(&self, texture_id: egui::TextureId) -> Option<&WebGlTexture> {
match texture_id {
egui::TextureId::Egui => Some(&self.egui_texture),

6
egui_web/src/webgl2.rs
View File

@@ -109,7 +109,11 @@ impl WebGl2Painter {
srgba_pixels: &[Color32],
) -> egui::TextureId {
let index = self.alloc_user_texture_index();
assert_eq!(size.0 * size.1, srgba_pixels.len());
assert_eq!(
size.0 * size.1,
srgba_pixels.len(),
"Mismatch between texture size and texel count"
);
if let Some(Some(user_texture)) = self.user_textures.get_mut(index) {
let mut pixels: Vec<u8> = Vec::with_capacity(srgba_pixels.len() * 4);