chore: updates

Author: triniwiz

Cargo.toml

@@ -27,7 +27,7 @@ strip = true
 [workspace.dependencies.wgt]
 package = "wgpu-types"
 git = "https://github.com/triniwiz/wgpu"
-rev = "bc52e9448087a79b78d2231f0ddd7409781551f7"
+rev = "6f163cdf622bd183fcfc20224294b797312550bb"
 
 [workspace.dependencies]
 env_logger = "0.11.5"
@@ -41,7 +41,7 @@ gl-bindings = { path = "./crates/gl-bindings" }
 canvas-c = { path = "./crates/canvas-c" }
 skia-safe = { version = "0.80.0", features = ["textlayout"] }
 itertools = "0.13.0"
-wgpu-core = { git = "https://github.com/triniwiz/wgpu", rev = "bc52e9448087a79b78d2231f0ddd7409781551f7", features = ["wgsl", "vulkan", "metal", "raw-window-handle"] }
-wgpu-types = { git = "https://github.com/triniwiz/wgpu", rev = "bc52e9448087a79b78d2231f0ddd7409781551f7" }
+wgpu-core = { git = "https://github.com/triniwiz/wgpu", rev = "6f163cdf622bd183fcfc20224294b797312550bb", features = ["wgsl", "vulkan", "metal", "raw-window-handle"] }
+wgpu-types = { git = "https://github.com/triniwiz/wgpu", rev = "6f163cdf622bd183fcfc20224294b797312550bb" }
 ureq = "2.10.1"
 jni = "0.21.1"

crates/canvas-c/Cargo.toml

@@ -27,6 +27,7 @@ raw-window-handle.workspace = true
 wgpu-core = { workspace = true, features = ["wgsl", "vulkan", "metal", "raw-window-handle"] }
 infer = "0.16.0"
 image = { version = "0.25.5", optional = true }
+
 [target.'cfg(target_os="ios")'.dependencies]
 display-link = { version = "0.2.0" }
 wgpu-core = { workspace = true, features = ["wgsl", "metal", "raw-window-handle"] }

crates/canvas-c/src/webgpu/enums.rs

@@ -21,6 +21,7 @@ pub enum SurfaceGetCurrentTextureStatus {
     OutOfMemory = 0x00000004,
     DeviceLost = 0x00000005,
     Force32 = 0x7FFFFFFF,
+    Unknown = 0x00000006
 }
 
 #[repr(C)]
@@ -1873,6 +1874,7 @@ impl Into<Option<wgt::FrontFace>> for CanvasOptionalFrontFace {
 }
 
 #[repr(C)]
+#[derive(Debug)]
 pub struct CanvasBufferBinding {
     pub buffer: *const CanvasGPUBuffer,
     pub offset: i64,
@@ -1898,13 +1900,15 @@ impl Into<BufferBinding> for CanvasBufferBinding {
 }
 
 #[repr(C)]
+#[derive(Debug)]
 pub enum CanvasBindGroupEntryResource {
     Buffer(CanvasBufferBinding),
     Sampler(*const CanvasGPUSampler),
     TextureView(*const CanvasGPUTextureView),
 }
 
 #[repr(C)]
+#[derive(Debug)]
 pub struct CanvasBindGroupEntry {
     pub binding: u32,
     pub resource: CanvasBindGroupEntryResource,

crates/canvas-c/src/webgpu/gpu_adapter_info.rs

@@ -8,22 +8,28 @@ impl CanvasGPUAdapterInfo {
         Self(types)
     }
 
-    pub fn vendor(&self) -> String {
-        self.0.vendor.to_string()
+    pub fn vendor(&self) -> &str {
+        self.0.driver.as_str()
     }
 
     pub fn architecture(&self) -> &str {
         ""
     }
-    pub fn device(&self) -> String {
-        self.0.device.to_string()
+    pub fn device(&self) -> &str {
+        self.0.name.as_str()
     }
 
     pub fn description(&self) -> &str {
-        self.0.name.as_str()
+        self.0.driver_info.as_str()
+    }
+    pub fn vendor_id(&self) -> u32 {
+        self.0.vendor
     }
-}
 
+    pub fn device_id(&self) -> u32 {
+        self.0.device
+    }
+}
 
 #[no_mangle]
 pub extern "C" fn canvas_native_webgpu_adapter_info_vendor(
@@ -33,7 +39,7 @@ pub extern "C" fn canvas_native_webgpu_adapter_info_vendor(
         return std::ptr::null_mut();
     }
     let info = unsafe { &*info };
-    CString::new(info.0.vendor.to_string()).unwrap().into_raw()
+    CString::new(info.0.driver.clone()).unwrap().into_raw()
 }
 
 #[no_mangle]
@@ -54,7 +60,7 @@ pub extern "C" fn canvas_native_webgpu_adapter_info_device(
         return std::ptr::null_mut();
     }
     let info = unsafe { &*info };
-    CString::new(info.0.device.to_string()).unwrap().into_raw()
+    CString::new(info.0.name.clone()).unwrap().into_raw()
 }
 
 #[no_mangle]
@@ -65,7 +71,7 @@ pub extern "C" fn canvas_native_webgpu_adapter_info_description(
         return std::ptr::null_mut();
     }
     let info = unsafe { &*info };
-    CString::new(info.0.name.clone()).unwrap().into_raw()
+    CString::new(info.0.driver_info.clone()).unwrap().into_raw()
 }
 
 #[no_mangle]

crates/canvas-c/src/webgpu/gpu_buffer.rs

@@ -36,6 +36,7 @@ impl From<wgpu_core::device::HostMap> for GPUMapMode {
     }
 }
 
+#[derive(Debug)]
 pub struct CanvasGPUBuffer {
     pub(crate) instance: Arc<CanvasWebGPUInstance>,
     pub(crate) label: Option<Cow<'static, str>>,