Update CEF

desktop/src/gpu_context.rs

@@ -1,7 +1,7 @@
 use crate::wrapper::{WgpuContext, WgpuContextBuilder, WgpuFeatures};
 
 pub(super) async fn create_wgpu_context() -> WgpuContext {
-	let wgpu_context_builder = WgpuContextBuilder::new().with_features(WgpuFeatures::PUSH_CONSTANTS);
+	let wgpu_context_builder = WgpuContextBuilder::new().with_features(WgpuFeatures::IMMEDIATES);
 
 	// TODO: add a cli flag to list adapters and exit instead of always printing
 	println!("\nAvailable WGPU adapters:\n{}", wgpu_context_builder.available_adapters_fmt().await);

desktop/src/render/composite_shader.wgsl

@@ -26,14 +26,14 @@ fn vs_main(@builtin(vertex_index) vertex_index: u32) -> VertexOutput {
 // FRAGMENT SHADER
 // ===============
 
-struct Constants {
+struct Immediates {
 	viewport_scale: vec2<f32>,
 	viewport_offset: vec2<f32>,
 	ui_scale: vec2<f32>,
 	background_color: vec4<f32>,
 };
 
-var<push_constant> constants: Constants;
+var<immediate> immediates: Immediates;
 
 @group(0) @binding(0)
 var t_viewport: texture_2d<f32>;
@@ -46,10 +46,10 @@ var s_diffuse: sampler;
 
 @fragment
 fn fs_main(in: VertexOutput) -> @location(0) vec4<f32> {
-	let ui_coordinate = in.tex_coords * constants.ui_scale;
+	let ui_coordinate = in.tex_coords * immediates.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(constants.background_color);
+		return srgb_to_linear(immediates.background_color);
 	}
 
 	let ui_linear = srgb_to_linear(textureSample(t_ui, s_diffuse, ui_coordinate));
@@ -60,19 +60,19 @@ fn fs_main(in: VertexOutput) -> @location(0) vec4<f32> {
 	// UI texture is premultiplied, we need to unpremultiply before blending
 	let ui_srgb = linear_to_srgb(unpremultiply(ui_linear));
 
-	let viewport_coordinate = (in.tex_coords - constants.viewport_offset) * constants.viewport_scale;
+	let viewport_coordinate = (in.tex_coords - immediates.viewport_offset) * immediates.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(constants.background_color);
+		return srgb_to_linear(immediates.background_color);
 	}
 
 	let overlay_srgb = textureSample(t_overlays, s_diffuse, viewport_coordinate);
 	var viewport_srgb = textureSample(t_viewport, s_diffuse, viewport_coordinate);
 
 	if (viewport_srgb.a < 0.001) {
-		viewport_srgb = constants.background_color;
+		viewport_srgb = immediates.background_color;
 	} else if (viewport_srgb.a < 0.999) {
-		viewport_srgb = blend(viewport_srgb, constants.background_color);
+		viewport_srgb = blend(viewport_srgb, immediates.background_color);
 	}
 
 	if (overlay_srgb.a < 0.001) {

desktop/src/render/state.rs

@@ -73,7 +73,7 @@ impl RenderState {
 			address_mode_w: wgpu::AddressMode::ClampToEdge,
 			mag_filter: wgpu::FilterMode::Linear,
 			min_filter: wgpu::FilterMode::Nearest,
-			mipmap_filter: wgpu::FilterMode::Nearest,
+			mipmap_filter: wgpu::MipmapFilterMode::Nearest,
 			..Default::default()
 		});
 
@@ -122,10 +122,7 @@ impl RenderState {
 		let render_pipeline_layout = context.device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
 			label: Some("Render Pipeline Layout"),
 			bind_group_layouts: &[&texture_bind_group_layout],
-			push_constant_ranges: &[wgpu::PushConstantRange {
-				stages: wgpu::ShaderStages::FRAGMENT,
-				range: 0..size_of::<Constants>() as u32,
-			}],
+			immediate_size: size_of::<Immediates>() as u32,
 		});
 
 		let render_pipeline = context.device.create_render_pipeline(&wgpu::RenderPipelineDescriptor {
@@ -162,7 +159,7 @@ impl RenderState {
 				mask: !0,
 				alpha_to_coverage_enabled: false,
 			},
-			multiview: None,
+			multiview_mask: None,
 			cache: None,
 		});
 
@@ -281,13 +278,13 @@ impl RenderState {
 				depth_stencil_attachment: None,
 				occlusion_query_set: None,
 				timestamp_writes: None,
+				multiview_mask: None,
 			});
 
 			render_pass.set_pipeline(&self.render_pipeline);
-			render_pass.set_push_constants(
-				wgpu::ShaderStages::FRAGMENT,
+			render_pass.set_immediates(
 				0,
-				bytemuck::bytes_of(&Constants {
+				bytemuck::bytes_of(&Immediates {
 					viewport_scale: self.viewport_scale,
 					viewport_offset: self.viewport_offset,
 					ui_scale: ui_scale.unwrap_or([1., 1.]),
@@ -358,7 +355,7 @@ pub(crate) enum RenderError {
 
 #[repr(C)]
 #[derive(Copy, Clone, bytemuck::Pod, bytemuck::Zeroable)]
-struct Constants {
+struct Immediates {
 	viewport_scale: [f32; 2],
 	viewport_offset: [f32; 2],
 	ui_scale: [f32; 2],