1
0
mirror of https://github.com/emilk/egui.git synced 2026-08-31 13:50:04 -04:00
* Adapt to latest wgpu changes

* Point to latest wgpu commit

* Fix egui-wgpu winit

* wgpu 0.16

* Fix web compilation issue

* Add libloading to deny.toml skip

* lock fix after merge, sort deny skip list

---------

Co-authored-by: Andreas Reich <r_andreas2@web.de>
This commit is contained in:
Niklas Korz
2023-04-21 11:40:25 +02:00
committed by GitHub
parent 4d357b0f02
commit f962378243
7 changed files with 91 additions and 83 deletions

View File

@@ -2,7 +2,7 @@
use std::num::NonZeroU64;
use std::ops::Range;
use std::{borrow::Cow, collections::HashMap, num::NonZeroU32};
use std::{borrow::Cow, collections::HashMap};
use type_map::concurrent::TypeMap;
use wgpu;
@@ -295,7 +295,7 @@ impl Renderer {
fragment: Some(wgpu::FragmentState {
module: &module,
entry_point: if output_color_format.describe().srgb {
entry_point: if output_color_format.is_srgb() {
log::warn!("Detected a linear (sRGBA aware) framebuffer {:?}. egui prefers Rgba8Unorm or Bgra8Unorm", output_color_format);
"fs_main_linear_framebuffer"
} else {
@@ -535,8 +535,8 @@ impl Renderer {
data_bytes,
wgpu::ImageDataLayout {
offset: 0,
bytes_per_row: NonZeroU32::new(4 * width),
rows_per_image: NonZeroU32::new(height),
bytes_per_row: Some(4 * width),
rows_per_image: Some(height),
},
size,
);

View File

@@ -407,7 +407,7 @@ impl Painter {
buffer,
layout: wgpu::ImageDataLayout {
offset: 0,
bytes_per_row: Some(std::num::NonZeroU32::new(padding.padded_bytes_per_row)?),
bytes_per_row: Some(padding.padded_bytes_per_row),
rows_per_image: None,
},
},