refactor: ⬆️ Update wgpu

alvr/dashboard/Cargo.toml

@@ -34,7 +34,7 @@ tungstenite = "0.24"
 ureq = { version = "2", features = ["json"] }
 
 [target.'cfg(target_os = "linux")'.dependencies]
-wgpu = "0.20"
+wgpu = "24"
 libva = { package = "cros-libva", version = "0.0.7" }
 nvml-wrapper = "0.10.0"
 

alvr/dashboard/src/main.rs

@@ -40,11 +40,9 @@ fn main() {
 
         #[cfg(target_os = "linux")]
         {
-            let has_nvidia = wgpu::Instance::new(wgpu::InstanceDescriptor {
+            let has_nvidia = wgpu::Instance::new(&wgpu::InstanceDescriptor {
                 backends: wgpu::Backends::VULKAN,
-                flags: wgpu::InstanceFlags::empty(),
-                dx12_shader_compiler: Default::default(),
-                gles_minor_version: Default::default(),
+                ..Default::default()
             })
             .enumerate_adapters(wgpu::Backends::VULKAN)
             .iter()

alvr/dashboard/src/steamvr_launcher/linux_steamvr.rs

@@ -63,11 +63,9 @@ enum DeviceInfo {
 }
 
 pub fn linux_hardware_checks() {
-    let wgpu_adapters = wgpu::Instance::new(wgpu::InstanceDescriptor {
+    let wgpu_adapters = wgpu::Instance::new(&wgpu::InstanceDescriptor {
         backends: wgpu::Backends::VULKAN,
-        flags: wgpu::InstanceFlags::empty(),
-        dx12_shader_compiler: Default::default(),
-        gles_minor_version: Default::default(),
+        ..Default::default()
     })
     .enumerate_adapters(wgpu::Backends::VULKAN);
     let device_infos = wgpu_adapters

alvr/graphics/Cargo.toml

@@ -10,9 +10,9 @@ license.workspace = true
 alvr_common.workspace = true
 alvr_session.workspace = true
 
-glow = "0.13"
+glow = "0.16"
 glyph_brush_layout = "0.2"
 khronos-egl = { version = "6", features = ["dynamic"] }
 pollster = "0.3"
-wgpu = "0.20"
-wgpu-core = { version = "0.21", features = ["gles"] }
+wgpu = "24"
+wgpu-core = { version = "24", features = ["gles"] }

alvr/graphics/src/lib.rs

@@ -136,25 +136,23 @@ fn create_texture_from_gles(
     };
 
     unsafe {
-        let hal_texture = device
-            .as_hal::<api::Gles, _, _>(|device| {
-                device.unwrap().texture_from_raw(
-                    NonZeroU32::new(texture).unwrap(),
-                    &hal::TextureDescriptor {
-                        label: None,
-                        size,
-                        mip_level_count: 1,
-                        sample_count: 1,
-                        dimension: TextureDimension::D2,
-                        format,
-                        usage: TextureUses::COLOR_TARGET,
-                        memory_flags: MemoryFlags::empty(),
-                        view_formats: vec![],
-                    },
-                    Some(Box::new(())),
-                )
-            })
-            .unwrap();
+        let hal_texture = device.as_hal::<api::Gles, _, _>(|device| {
+            device.unwrap().texture_from_raw(
+                NonZeroU32::new(texture).unwrap(),
+                &hal::TextureDescriptor {
+                    label: None,
+                    size,
+                    mip_level_count: 1,
+                    sample_count: 1,
+                    dimension: TextureDimension::D2,
+                    format,
+                    usage: TextureUses::COLOR_TARGET,
+                    memory_flags: MemoryFlags::empty(),
+                    view_formats: vec![],
+                },
+                Some(Box::new(|| ())),
+            )
+        });
 
         device.create_texture_from_hal::<api::Gles>(
             hal_texture,
@@ -216,6 +214,7 @@ impl GraphicsContext {
         use std::mem;
         use wgpu::{
             Backends, DeviceDescriptor, Features, InstanceDescriptor, InstanceFlags, Limits,
+            MemoryHints,
         };
 
         const CREATE_IMAGE_FN_STR: &str = "eglCreateImageKHR";
@@ -229,11 +228,10 @@ impl GraphicsContext {
             InstanceFlags::empty()
         };
 
-        let instance = Instance::new(InstanceDescriptor {
+        let instance = Instance::new(&InstanceDescriptor {
             backends: Backends::GL,
             flags,
-            dx12_shader_compiler: Default::default(),
-            gles_minor_version: Default::default(),
+            backend_options: Default::default(),
         });
 
         let adapter = instance.enumerate_adapters(Backends::GL).remove(0);
@@ -245,6 +243,7 @@ impl GraphicsContext {
                     max_push_constant_size: MAX_PUSH_CONSTANTS_SIZE,
                     ..adapter.limits()
                 },
+                memory_hints: MemoryHints::Performance,
             },
             None,
         ))

alvr/graphics/src/lobby.rs

@@ -12,11 +12,11 @@ use wgpu::{
     include_wgsl, BindGroup, BindGroupDescriptor, BindGroupEntry, BindGroupLayout,
     BindGroupLayoutDescriptor, BindGroupLayoutEntry, BindingResource, BindingType, BlendComponent,
     BlendFactor, BlendOperation, BlendState, Color, ColorTargetState, ColorWrites,
-    CommandEncoderDescriptor, Device, Extent3d, FilterMode, FragmentState, ImageCopyTexture,
-    ImageDataLayout, LoadOp, Operations, Origin3d, PipelineLayoutDescriptor, PrimitiveState,
-    PrimitiveTopology, PushConstantRange, RenderPass, RenderPassColorAttachment,
-    RenderPassDescriptor, RenderPipeline, RenderPipelineDescriptor, SamplerBindingType,
-    SamplerDescriptor, ShaderModuleDescriptor, ShaderStages, StoreOp, Texture, TextureAspect,
+    CommandEncoderDescriptor, Device, Extent3d, FilterMode, FragmentState, LoadOp, Operations,
+    Origin3d, PipelineLayoutDescriptor, PrimitiveState, PrimitiveTopology, PushConstantRange,
+    RenderPass, RenderPassColorAttachment, RenderPassDescriptor, RenderPipeline,
+    RenderPipelineDescriptor, SamplerBindingType, SamplerDescriptor, ShaderModuleDescriptor,
+    ShaderStages, StoreOp, TexelCopyBufferLayout, TexelCopyTextureInfo, Texture, TextureAspect,
     TextureSampleType, TextureView, TextureViewDimension, VertexState,
 };
 
@@ -180,7 +180,7 @@ fn create_pipeline(
         })),
         vertex: VertexState {
             module: &shader_module,
-            entry_point: "vertex_main",
+            entry_point: None,
             compilation_options: Default::default(),
             buffers: &[],
         },
@@ -192,7 +192,7 @@ fn create_pipeline(
         multisample: Default::default(),
         fragment: Some(FragmentState {
             module: &shader_module,
-            entry_point: "fragment_main",
+            entry_point: None,
             compilation_options: Default::default(),
             targets: &[Some(ColorTargetState {
                 format: SDR_FORMAT,
@@ -212,6 +212,7 @@ fn create_pipeline(
             })],
         }),
         multiview: None,
+        cache: None,
     })
 }
 
@@ -384,14 +385,14 @@ impl LobbyRenderer {
         }
 
         self.context.queue.write_texture(
-            ImageCopyTexture {
+            TexelCopyTextureInfo {
                 texture: &self.hud_texture,
                 mip_level: 0,
                 origin: Origin3d::ZERO,
                 aspect: TextureAspect::All,
             },
             &buffer,
-            ImageDataLayout {
+            TexelCopyBufferLayout {
                 offset: 0,
                 bytes_per_row: Some(HUD_TEXTURE_SIDE as u32 * 4),
                 rows_per_image: Some(HUD_TEXTURE_SIDE as u32),

alvr/graphics/src/stream.rs

@@ -128,7 +128,7 @@ impl StreamRenderer {
             })),
             vertex: VertexState {
                 module: &shader_module,
-                entry_point: "vertex_main",
+                entry_point: None,
                 compilation_options: PipelineCompilationOptions {
                     constants: &constants,
                     zero_initialize_workgroup_memory: false,
@@ -143,7 +143,7 @@ impl StreamRenderer {
             multisample: Default::default(),
             fragment: Some(FragmentState {
                 module: &shader_module,
-                entry_point: "fragment_main",
+                entry_point: None,
                 compilation_options: PipelineCompilationOptions {
                     constants: &constants,
                     zero_initialize_workgroup_memory: false,
@@ -155,6 +155,7 @@ impl StreamRenderer {
                 })],
             }),
             multiview: None,
+            cache: None,
         });
 
         let sampler = device.create_sampler(&SamplerDescriptor {