Export CanvasWrapper, OffscreenCanvasWrapper in web_rwh feature

jinleili · Jan 2, 2025 · dca7db1 · dca7db1
1 parent 5626a80
commit dca7db1
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 149 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -28,10 +28,9 @@ android_logger = "0.14"
 jni = "0.21"
 jni_fn = "0.1"
 ndk-sys = "0.6"
-ash = "0.38"
 
 # wasm target
-web-sys = "0.3.72"
-wasm-bindgen = "0.2.95"
-js-sys = "0.3.72"
-wasm-bindgen-futures = "0.4.45"
+web-sys = "0.3.76"
+wasm-bindgen = "0.2.99"
+js-sys = "0.3.76"
+wasm-bindgen-futures = "0.4.49"
diff --git a/app-surface/Cargo.toml b/app-surface/Cargo.toml
@@ -3,7 +3,7 @@ name = "app-surface"
 authors = ["jinleili"]
 description = "Integrate wgpu into your existing iOS, Android and Web apps without relying on winit."
 edition = "2021"
-version = "1.3.2"
+version = "1.3.3"
 rust-version = "1.76"
 repository = "https://github.com/jinleili/wgpu-in-app"
 keywords = ["android", "SurfaceView", "CAMetalLayer", "Canvas", "wgpu"]
@@ -49,7 +49,6 @@ android_logger.workspace = true
 jni.workspace = true
 ndk-sys.workspace = true
 raw-window-handle.workspace = true
-ash.workspace = true
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 winit.workspace = true

diff --git a/app-surface/src/app_surface_use_winit.rs b/app-surface/src/app_surface_use_winit.rs
@@ -36,7 +36,7 @@ impl AppSurface {
     }
 
     pub fn get_view(&self) -> &Window {
-        return self.view.as_ref().unwrap();
+        self.view.as_ref().unwrap()
     }
 
     #[allow(unused_variables)]

diff --git a/app-surface/src/web_rwh/canvas.rs b/app-surface/src/web_rwh/canvas.rs
@@ -89,7 +89,7 @@ impl Deref for Canvas {
     }
 }
 
-impl HasWindowHandle for Canvas {
+impl HasWindowHandle for CanvasWrapper {
     fn window_handle(
         &self,
     ) -> Result<raw_window_handle::WindowHandle<'_>, raw_window_handle::HandleError> {
@@ -101,7 +101,7 @@ impl HasWindowHandle for Canvas {
     }
 }
 
-impl HasDisplayHandle for Canvas {
+impl HasDisplayHandle for CanvasWrapper {
     fn display_handle(
         &self,
     ) -> Result<raw_window_handle::DisplayHandle<'_>, raw_window_handle::HandleError> {

diff --git a/app-surface/src/web_rwh/mod.rs b/app-surface/src/web_rwh/mod.rs
@@ -130,7 +130,7 @@ impl ViewObj {
 }
 
 #[derive(Clone, Debug)]
-pub(crate) struct SendSyncWrapper<T>(pub(crate) T);
+pub struct SendSyncWrapper<T>(pub T);
 
 unsafe impl<T> Send for SendSyncWrapper<T> {}
 unsafe impl<T> Sync for SendSyncWrapper<T> {}
diff --git a/app-surface/src/web_rwh/offscreen_canvas.rs b/app-surface/src/web_rwh/offscreen_canvas.rs
@@ -64,7 +64,7 @@ impl From<&Canvas> for OffscreenCanvas {
     }
 }
 
-impl HasWindowHandle for OffscreenCanvas {
+impl HasWindowHandle for OffscreenCanvasWrapper {
     fn window_handle(
         &self,
     ) -> Result<raw_window_handle::WindowHandle<'_>, raw_window_handle::HandleError> {
@@ -78,7 +78,7 @@ impl HasWindowHandle for OffscreenCanvas {
     }
 }
 
-impl HasDisplayHandle for OffscreenCanvas {
+impl HasDisplayHandle for OffscreenCanvasWrapper {
     fn display_handle(
         &self,
     ) -> Result<raw_window_handle::DisplayHandle<'_>, raw_window_handle::HandleError> {

diff --git a/wgpu-in-app/Cargo.toml b/wgpu-in-app/Cargo.toml
@@ -45,126 +45,10 @@ log-panics = "*"
 web-sys = { workspace = true, features = [
     "Document",
     "Navigator",
-    "Node",
-    "NodeList",
     "Gpu",
-    "GpuAdapter",
-    "GpuAddressMode",
-    "GpuAutoLayoutMode",
-    "GpuBindGroup",
-    "GpuBindGroupDescriptor",
-    "GpuBindGroupEntry",
-    "GpuBindGroupLayout",
-    "GpuBindGroupLayoutDescriptor",
-    "GpuBindGroupLayoutEntry",
-    "GpuBlendComponent",
-    "GpuBlendFactor",
-    "GpuBlendOperation",
-    "GpuBlendState",
-    "GpuBuffer",
-    "GpuBufferBinding",
-    "GpuBufferBindingLayout",
-    "GpuBufferBindingType",
-    "GpuBufferDescriptor",
-    "GpuCanvasAlphaMode",
-    "GpuCanvasContext",
-    "GpuCanvasConfiguration",
-    "GpuColorDict",
-    "GpuColorTargetState",
-    "GpuCommandBuffer",
-    "GpuCommandBufferDescriptor",
-    "GpuCommandEncoder",
-    "GpuCommandEncoderDescriptor",
-    "GpuCompareFunction",
-    "GpuCompilationInfo",
-    "GpuCompilationMessage",
-    "GpuCompilationMessageType",
-    "GpuComputePassDescriptor",
-    "GpuComputePassEncoder",
-    "GpuComputePipeline",
-    "GpuComputePipelineDescriptor",
-    "GpuCullMode",
-    "GpuDepthStencilState",
-    "GpuDevice",
-    "GpuDeviceDescriptor",
-    "GpuDeviceLostInfo",
-    "GpuDeviceLostReason",
-    "GpuError",
-    "GpuErrorFilter",
-    "GpuExtent3dDict",
-    "GpuFeatureName",
-    "GpuFilterMode",
-    "GpuFragmentState",
-    "GpuFrontFace",
-    "GpuImageCopyBuffer",
-    "GpuImageCopyTexture",
-    "GpuImageDataLayout",
-    "GpuIndexFormat",
-    "GpuLoadOp",
-    "gpu_map_mode",
-    "GpuMipmapFilterMode",
-    "GpuMultisampleState",
-    "GpuObjectDescriptorBase",
-    "GpuOrigin2dDict",
-    "GpuOrigin3dDict",
-    "GpuOutOfMemoryError",
-    "GpuPipelineDescriptorBase",
-    "GpuPipelineLayout",
-    "GpuPipelineLayoutDescriptor",
-    "GpuPowerPreference",
-    "GpuPrimitiveState",
-    "GpuPrimitiveTopology",
-    "GpuProgrammableStage",
-    "GpuQuerySet",
-    "GpuQuerySetDescriptor",
-    "GpuQueryType",
-    "GpuQueue",
-    "GpuRenderBundle",
-    "GpuRenderBundleDescriptor",
-    "GpuRenderBundleEncoder",
-    "GpuRenderBundleEncoderDescriptor",
-    "GpuRenderPassColorAttachment",
-    "GpuRenderPassDepthStencilAttachment",
-    "GpuRenderPassDescriptor",
-    "GpuRenderPassEncoder",
-    "GpuRenderPipeline",
-    "GpuRenderPipelineDescriptor",
-    "GpuRequestAdapterOptions",
-    "GpuSampler",
-    "GpuSamplerBindingLayout",
-    "GpuSamplerBindingType",
-    "GpuSamplerDescriptor",
-    "GpuShaderModule",
-    "GpuShaderModuleDescriptor",
-    "GpuStencilFaceState",
-    "GpuStencilOperation",
-    "GpuStorageTextureAccess",
-    "GpuStorageTextureBindingLayout",
-    "GpuStoreOp",
-    "GpuSupportedFeatures",
-    "GpuSupportedLimits",
-    "GpuTexture",
-    "GpuTextureAspect",
-    "GpuTextureBindingLayout",
-    "GpuTextureDescriptor",
-    "GpuTextureDimension",
-    "GpuTextureFormat",
-    "GpuTextureSampleType",
-    "GpuTextureView",
-    "GpuTextureViewDescriptor",
-    "GpuTextureViewDimension",
-    "GpuUncapturedErrorEvent",
-    "GpuUncapturedErrorEventInit",
-    "GpuValidationError",
-    "GpuVertexAttribute",
-    "GpuVertexBufferLayout",
-    "GpuVertexFormat",
-    "GpuVertexState",
-    "GpuVertexStepMode",
+    "GpuAdapter",    
     "HtmlCanvasElement",
     "OffscreenCanvas",
-    "ImageBitmap",
-    "ImageBitmapRenderingContext",
     "Window",
 ] }
 wasm-bindgen.workspace = true