Merge #227

227: [web] add tex_image_* fns for VideoFrame r=grovesNL a=jawadsh123 Hey 👋 texImage* bindings for VideoFrame were recently merged into web-sys (rustwasm/wasm-bindgen#3077) this PR allows using them on web through glow gated them behind `web_sys_unstable_apis`, since VideoFrame is [unstable in web-sys](https://rustwasm.github.io/wasm-bindgen/api/web_sys/struct.VideoFrame.html) Co-authored-by: Jawad Shaikh <shaikhjawad007@gmail.com>
grovesNL · Sep 20, 2022 · c8a011f · c8a011f
2 parents 757fe99 + 65415bf
commit c8a011f
Show file tree

Hide file tree

Showing 2 changed files with 154 additions and 1 deletion.
diff --git a/Cargo.toml b/Cargo.toml
@@ -39,7 +39,7 @@ wasm-bindgen = "~0.2"
 slotmap = "1"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies.web_sys]
-version = "~0.3.58"
+version = "~0.3.60"
 package = "web-sys"
 features = [
   "Document",
@@ -48,6 +48,7 @@ features = [
   "HtmlImageElement",
   "HtmlVideoElement",
   "ImageBitmap",
+  "VideoFrame",
   "WebGlActiveInfo",
   "WebGlBuffer",
   "WebGlFramebuffer",

diff --git a/src/web_sys.rs b/src/web_sys.rs
@@ -10,6 +10,9 @@ use web_sys::{
     WebGlUniformLocation, WebGlVertexArrayObject,
 };
 
+#[cfg(web_sys_unstable_apis)]
+use web_sys::VideoFrame;
+
 #[derive(Debug)]
 enum RawRenderingContext {
     WebGl1(WebGlRenderingContext),
@@ -303,6 +306,8 @@ impl Context {
     // - image_bitmap
     // - html_canvas
     // - html_image
+    // - html_video
+    // - video_frame
 
     pub unsafe fn tex_image_2d_with_image_bitmap(
         &self,
@@ -452,6 +457,44 @@ impl Context {
         }
     }
 
+    #[cfg(web_sys_unstable_apis)]
+    pub unsafe fn tex_image_2d_with_video_frame(
+        &self,
+        target: u32,
+        level: i32,
+        internal_format: i32,
+        format: u32,
+        ty: u32,
+        video_frame: &VideoFrame,
+    ) {
+        match self.raw {
+            RawRenderingContext::WebGl1(ref gl) => {
+                // TODO: Handle return value?
+                gl.tex_image_2d_with_u32_and_u32_and_video_frame(
+                    target,
+                    level,
+                    internal_format,
+                    format,
+                    ty,
+                    video_frame,
+                )
+                .unwrap();
+            }
+            RawRenderingContext::WebGl2(ref gl) => {
+                // TODO: Handle return value?
+                gl.tex_image_2d_with_u32_and_u32_and_video_frame(
+                    target,
+                    level,
+                    internal_format,
+                    format,
+                    ty,
+                    video_frame,
+                )
+                .unwrap();
+            }
+        }
+    }
+
     pub unsafe fn tex_sub_image_2d_with_image_bitmap(
         &self,
         target: u32,
@@ -530,6 +573,45 @@ impl Context {
         }
     }
 
+    #[cfg(web_sys_unstable_apis)]
+    pub unsafe fn tex_sub_image_2d_with_video_frame(
+        &self,
+        target: u32,
+        level: i32,
+        x_offset: i32,
+        y_offset: i32,
+        format: u32,
+        ty: u32,
+        video_frame: &VideoFrame,
+    ) {
+        match self.raw {
+            RawRenderingContext::WebGl1(ref gl) => {
+                gl.tex_sub_image_2d_with_u32_and_u32_and_video_frame(
+                    target,
+                    level,
+                    x_offset,
+                    y_offset,
+                    format,
+                    ty,
+                    video_frame,
+                )
+                .unwrap(); // TODO: Handle return value?
+            }
+            RawRenderingContext::WebGl2(ref gl) => {
+                gl.tex_sub_image_2d_with_u32_and_u32_and_video_frame(
+                    target,
+                    level,
+                    x_offset,
+                    y_offset,
+                    format,
+                    ty,
+                    video_frame,
+                )
+                .unwrap(); // TODO: Handle return value?
+            }
+        }
+    }
+
     pub unsafe fn tex_image_3d_with_image_bitmap(
         &self,
         target: u32,
@@ -629,6 +711,40 @@ impl Context {
         }
     }
 
+    #[cfg(web_sys_unstable_apis)]
+    pub unsafe fn tex_image_3d_with_video_frame(
+        &self,
+        target: u32,
+        level: i32,
+        internal_format: i32,
+        width: i32,
+        height: i32,
+        depth: i32,
+        border: i32,
+        format: u32,
+        ty: u32,
+        video_frame: &VideoFrame,
+    ) {
+        match self.raw {
+            RawRenderingContext::WebGl1(_) => panic!("3D images not supported"),
+            RawRenderingContext::WebGl2(ref gl) => {
+                gl.tex_image_3d_with_video_frame(
+                    target,
+                    level,
+                    internal_format,
+                    width,
+                    height,
+                    depth,
+                    border,
+                    format,
+                    ty,
+                    video_frame,
+                )
+                .unwrap(); // TODO: Handle return value?
+            }
+        }
+    }
+
     pub unsafe fn tex_sub_image_3d_with_image_bitmap(
         &self,
         target: u32,
@@ -707,6 +823,42 @@ impl Context {
         }
     }
 
+    #[cfg(web_sys_unstable_apis)]
+    pub unsafe fn tex_sub_image_3d_with_video_frame(
+        &self,
+        target: u32,
+        level: i32,
+        x_offset: i32,
+        y_offset: i32,
+        z_offset: i32,
+        width: i32,
+        height: i32,
+        depth: i32,
+        format: u32,
+        ty: u32,
+        video_frame: &VideoFrame,
+    ) {
+        match self.raw {
+            RawRenderingContext::WebGl1(_) => panic!("3D images not supported"),
+            RawRenderingContext::WebGl2(ref gl) => {
+                gl.tex_sub_image_3d_with_video_frame(
+                    target,
+                    level,
+                    x_offset,
+                    y_offset,
+                    z_offset,
+                    width,
+                    height,
+                    depth,
+                    format,
+                    ty,
+                    video_frame,
+                )
+                .unwrap(); // TODO: Handle return value?
+            }
+        }
+    }
+
     pub unsafe fn framebuffer_texture_multiview_ovr(
         &self,
         target: u32,