Skip to content
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.

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

Upgrade to latest wgpu, winit, egui #1587

Merged
merged 3 commits into from
Feb 14, 2023
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
758 changes: 231 additions & 527 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion crates/fj-host/Cargo.toml
Original file line number Diff line number Diff line change
@@ -21,4 +21,4 @@ libloading = "0.7.4"
notify = "5.1.0"
thiserror = "1.0.35"
tracing = "0.1.37"
winit = "0.27.5"
winit = "0.28.1"
7 changes: 3 additions & 4 deletions crates/fj-viewer/Cargo.toml
Original file line number Diff line number Diff line change
@@ -14,16 +14,15 @@ categories.workspace = true
bytemuck = "1.13.0"
chrono = "0.4.23"
crossbeam-channel = "0.5.6"
egui = "0.20.1"
egui-wgpu = "0.20.0"
egui = "0.21.0"
egui-wgpu = "0.21.0"
fj-interop.workspace = true
fj-math.workspace = true
nalgebra = "0.32.1"
tobj = "3.2.4"
raw-window-handle = "0.5.0"
thiserror = "1.0.35"
tracing = "0.1.37"
wgpu_glyph = "0.18.0"

[dependencies.image]
version = "0.24"
@@ -36,7 +35,7 @@ default_features = false
features = ["xdg-portal"]

[dependencies.wgpu]
version = "0.14.2"
version = "0.15.1"
features = ["webgl"]

# We don't depend on `getrandom` directly, but we need this to enable the `js`
26 changes: 15 additions & 11 deletions crates/fj-viewer/src/graphics/renderer.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
use std::{io, mem::size_of};
use std::{io, mem::size_of, vec};

use thiserror::Error;
use tracing::debug;
use wgpu::util::DeviceExt as _;
use wgpu_glyph::ab_glyph::InvalidFont;

use crate::{
camera::Camera,
@@ -42,10 +41,13 @@ pub struct Renderer {
impl Renderer {
/// Returns a new `Renderer`.
pub async fn new(screen: &impl Screen) -> Result<Self, RendererInitError> {
let instance = wgpu::Instance::new(wgpu::Backends::PRIMARY);
let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
backends: wgpu::Backends::PRIMARY,
..Default::default()
});

// This is sound, as `window` is an object to create a surface upon.
let surface = unsafe { instance.create_surface(screen.window()) };
let surface = unsafe { instance.create_surface(screen.window()) }?;

let adapter = instance
.request_adapter(&wgpu::RequestAdapterOptions {
@@ -95,7 +97,8 @@ impl Renderer {
.await?;

let color_format = 'color_format: {
let supported_formats = surface.get_supported_formats(&adapter);
let capabilities = surface.get_capabilities(&adapter);
let supported_formats = capabilities.formats;

// We don't really care which color format we use, as long as we
// find one that's supported. `egui_wgpu` prints a warning though,
@@ -137,6 +140,7 @@ impl Renderer {
//
// @hannobraun
alpha_mode: wgpu::CompositeAlphaMode::Auto,
view_formats: vec![],
};
surface.configure(&device, &surface_config);

@@ -373,6 +377,7 @@ impl Renderer {
dimension: wgpu::TextureDimension::D2,
format: surface_config.format,
usage: wgpu::TextureUsages::RENDER_ATTACHMENT,
view_formats: &[],
});
texture.create_view(&wgpu::TextureViewDescriptor::default())
}
@@ -393,6 +398,7 @@ impl Renderer {
dimension: wgpu::TextureDimension::D2,
format: DEPTH_FORMAT,
usage: wgpu::TextureUsages::RENDER_ATTACHMENT,
view_formats: &[],
});

texture.create_view(&wgpu::TextureViewDescriptor::default())
@@ -411,6 +417,10 @@ pub enum RendererInitError {
#[error("I/O error: {0}")]
Io(#[from] io::Error),

/// Surface creating error
#[error("Error creating surface: {0}")]
CreateSurface(#[from] wgpu::CreateSurfaceError),

/// Graphics accelerator acquisition error
#[error("Error request adapter")]
RequestAdapter,
@@ -420,12 +430,6 @@ pub enum RendererInitError {
/// See: [wgpu::RequestDeviceError](https://docs.rs/wgpu/latest/wgpu/struct.RequestDeviceError.html)
#[error("Error requesting device: {0}")]
RequestDevice(#[from] wgpu::RequestDeviceError),

/// Error loading font
///
/// See: [ab_glyph::InvalidFont](https://docs.rs/ab_glyph/latest/ab_glyph/struct.InvalidFont.html)
#[error("Error loading font: {0}")]
InvalidFont(#[from] InvalidFont),
}

/// Graphics rendering error
2 changes: 1 addition & 1 deletion crates/fj-viewer/src/graphics/shader.wgsl
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@ fn vertex(in: VertexInput) -> VertexOutput {
return out;
}

let pi: f32 = 3.14159265359;
const pi: f32 = 3.14159265359;

@fragment
fn frag_model(in: VertexOutput) -> FragmentOutput {
1 change: 1 addition & 0 deletions crates/fj-viewer/src/graphics/texture.rs
Original file line number Diff line number Diff line change
@@ -48,6 +48,7 @@ impl Texture {
format: wgpu::TextureFormat::Rgba8UnormSrgb,
usage: wgpu::TextureUsages::TEXTURE_BINDING
| wgpu::TextureUsages::COPY_DST,
view_formats: &[],
});

queue.write_texture(
2 changes: 1 addition & 1 deletion crates/fj-viewer/src/gui.rs
Original file line number Diff line number Diff line change
@@ -181,7 +181,7 @@ impl Gui {
&& self.options.show_debug_text_example
{
let hover_pos =
ui.input().pointer.hover_pos().unwrap_or_default();
ui.input(|input| input.pointer.hover_pos().unwrap_or_default());
ui.painter().debug_text(
hover_pos,
egui::Align2::LEFT_TOP,
4 changes: 2 additions & 2 deletions crates/fj-window/Cargo.toml
Original file line number Diff line number Diff line change
@@ -19,8 +19,8 @@ crossbeam-channel = "0.5.6"
futures = "0.3.26"
thiserror = "1.0.35"
tracing = "0.1.37"
winit = "0.27.5"
winit = "0.28.1"

[dependencies.egui-winit]
version = "0.20.1"
version = "0.21.1"
default-features = false