better looking resize on mac

Author: timon-schelling

desktop/src/app.rs

@@ -442,6 +442,9 @@ impl ApplicationHandler for App {
 			WindowEvent::RedrawRequested => {
 				let Some(render_state) = &mut self.render_state else { return };
 				if let Some(window) = &self.window {
+					let size = window.surface_size();
+					render_state.resize(size.width, size.height);
+
 					match render_state.render(window) {
 						Ok(_) => {}
 						Err(RenderError::OutdatedUITextureError) => {

desktop/src/render/composite_shader.wgsl

@@ -23,6 +23,8 @@ fn vs_main(@builtin(vertex_index) vertex_index: u32) -> VertexOutput {
 struct Constants {
 	viewport_scale: vec2<f32>,
 	viewport_offset: vec2<f32>,
+	ui_scale: vec2<f32>,
+	background_color: vec4<f32>,
 };
 
 var<push_constant> constants: Constants;
@@ -38,7 +40,13 @@ var s_diffuse: sampler;
 
 @fragment
 fn fs_main(in: VertexOutput) -> @location(0) vec4<f32> {
-	let ui_linear = srgb_to_linear(textureSample(t_ui, s_diffuse, in.tex_coords));
+	let ui_coordinate = in.tex_coords * constants.ui_scale;
+	if (ui_coordinate.x < 0.0 || ui_coordinate.x > 1.0 ||
+		ui_coordinate.y < 0.0 || ui_coordinate.y > 1.0) {
+		return srgb_to_linear(vec4<f32>(0.1289, 0.1289, 0.1289, 1.0));
+	}
+
+	let ui_linear = srgb_to_linear(textureSample(t_ui, s_diffuse, ui_coordinate));
 	if (ui_linear.a >= 0.999) {
 		return ui_linear;
 	}
@@ -48,11 +56,6 @@ fn fs_main(in: VertexOutput) -> @location(0) vec4<f32> {
 
 	let viewport_coordinate = (in.tex_coords - constants.viewport_offset) * constants.viewport_scale;
 
-	if (viewport_coordinate.x < 0.0 || viewport_coordinate.x > 1.0 ||
-		viewport_coordinate.y < 0.0 || viewport_coordinate.y > 1.0) {
-		return srgb_to_linear(blend(ui_srgb, vec4<f32>(0.1289, 0.1289, 0.1289, 1.0)));
-	}
-
 	let overlay_srgb = textureSample(t_overlays, s_diffuse, viewport_coordinate);
 	let viewport_srgb = textureSample(t_viewport, s_diffuse, viewport_coordinate);
 

desktop/src/render/state.rs

@@ -186,6 +186,10 @@ impl RenderState {
 	}
 
 	pub(crate) fn resize(&mut self, width: u32, height: u32) {
+		if width == self.desired_width && height == self.desired_height {
+			return;
+		}
+
 		self.desired_width = width;
 		self.desired_height = height;
 
@@ -238,6 +242,14 @@ impl RenderState {
 	}
 
 	pub(crate) fn render(&mut self, window: &Window) -> Result<(), RenderError> {
+		let ui_scale = if let Some(ui_texture) = &self.ui_texture
+			&& (self.desired_width != ui_texture.width() || self.desired_height != ui_texture.height())
+		{
+			Some([self.desired_width as f32 / ui_texture.width() as f32, self.desired_height as f32 / ui_texture.height() as f32])
+		} else {
+			None
+		};
+
 		if let Some(scene) = self.overlays_scene.take() {
 			self.render_overlays(scene);
 		}
@@ -255,7 +267,7 @@ impl RenderState {
 					view: &view,
 					resolve_target: None,
 					ops: wgpu::Operations {
-						load: wgpu::LoadOp::Clear(wgpu::Color { r: 0.01, g: 0.01, b: 0.01, a: 1.0 }),
+						load: wgpu::LoadOp::Clear(wgpu::Color { r: 0.01, g: 0.01, b: 0.01, a: 1. }),
 						store: wgpu::StoreOp::Store,
 					},
 					depth_slice: None,
@@ -272,6 +284,8 @@ impl RenderState {
 				bytemuck::bytes_of(&Constants {
 					viewport_scale: self.viewport_scale,
 					viewport_offset: self.viewport_offset,
+					ui_scale: ui_scale.unwrap_or([1., 1.]),
+					background_color: [255. / 33., 255. / 33., 255. / 33., 255. / 33.], // #212121
 				}),
 			);
 			if let Some(bind_group) = &self.bind_group {
@@ -285,9 +299,7 @@ impl RenderState {
 		window.pre_present_notify();
 		output.present();
 
-		if let Some(ui_texture) = &self.ui_texture
-			&& (self.desired_width != ui_texture.width() || self.desired_height != ui_texture.height())
-		{
+		if ui_scale.is_some() {
 			return Err(RenderError::OutdatedUITextureError);
 		}
 
@@ -336,4 +348,6 @@ pub(crate) enum RenderError {
 struct Constants {
 	viewport_scale: [f32; 2],
 	viewport_offset: [f32; 2],
+	ui_scale: [f32; 2],
+	background_color: [f32; 4],
 }