fix(canvas): copyExternalImageToTexture pixel format

Author: triniwiz

crates/canvas-2d/Cargo.toml

@@ -19,7 +19,7 @@ gl-bindings = { workspace = true }
 csscolorparser = { git = "https://github.com/triniwiz/csscolorparser-rs.git", rev = "c8c7e86", features = ["named-colors"] }
 log.workspace = true
 skia-safe = { workspace = true, features = ["textlayout"] }
-bytes = "1.6.1"
+bytes = "1.7.2"
 env_logger = "0.11.2"
 ash = { version = "0.38.0", optional = true, features = ["libloading"] }
 raw-window-handle.workspace = true

crates/canvas-2d/src/context/mod.rs

@@ -5,7 +5,8 @@ use base64::Engine;
 use regex::bytes::Replacer;
 use skia_safe::image::CachingHint;
 use skia_safe::BlendMode;
-use skia_safe::{AlphaType, Color, ColorType, EncodedImageFormat, IPoint, ISize, Image, ImageInfo, Point, Surface};
+pub use skia_safe::ColorType;
+use skia_safe::{AlphaType, Color, EncodedImageFormat, IPoint, ISize, Image, ImageInfo, Point, Surface};
 
 use compositing::composite_operation_type::CompositeOperationType;
 use fill_and_stroke_styles::paint::Paint;
@@ -20,6 +21,7 @@ use text_styles::{
 
 use crate::context::drawing_text::typography::Font;
 
+
 use bitflags::bitflags;
 use bytes::Buf;
 
@@ -226,6 +228,18 @@ impl Context {
     }
 
 
+    pub fn get_pixels_format(&mut self, buffer: &mut [u8], origin: impl Into<IPoint>, size: impl Into<ISize>, color_type: ColorType) {
+        let origin = origin.into();
+        let size = size.into();
+        let mut info = ImageInfo::new(size, color_type, AlphaType::Unpremul, None);
+
+        if let Some(img) = self.get_image() {
+            let row_bytes = (info.width() * 4) as usize;
+            img.read_pixels(&info, buffer, row_bytes, origin, CachingHint::Allow);
+        }
+    }
+
+
     pub fn submit(&mut self) {
         #[cfg(any(feature = "gl", feature = "vulkan", feature = "metal"))]
         match self.direct_context.as_mut() {

crates/canvas-android/src/jni_compat/mod.rs

@@ -4,5 +4,4 @@ pub mod org_nativescript_canvas_NSCCanvas;
 pub mod org_nativescript_canvas_NSCCanvasRenderingContext2D;
 pub mod org_nativescript_canvas_NSCImageAsset;
 pub mod org_nativescript_canvas_NSCWebGLRenderingContext;
-
 pub mod org_nativescript_canvas_NSCImageBitmap;

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

@@ -5,6 +5,7 @@ use super::{
     gpu_command_encoder::CanvasImageCopyTexture,
     structs::{CanvasExtent3d, CanvasImageCopyExternalImage, CanvasImageDataLayout},
 };
+use crate::webgpu::enums::CanvasGPUTextureFormat;
 //use wgpu_core::gfx_select;
 use crate::webgpu::error::{handle_error, handle_error_fatal};
 use crate::webgpu::prelude::label_to_ptr;
@@ -144,6 +145,17 @@ pub unsafe extern "C" fn canvas_native_webgpu_queue_copy_webgl_to_texture(
         );
     }
 
+    {
+        let destination = &*destination;
+        let texture = &*destination.texture;
+        match texture.format {
+            CanvasGPUTextureFormat::Bgra8Unorm | CanvasGPUTextureFormat::Bgra8UnormSrgb => {
+                canvas_core::image_asset::ImageAsset::rgba_to_bgra_in_place(bytes.as_mut_slice())
+            }
+            _ => {}
+        }
+    }
+
 
     let ext_source = CanvasImageCopyExternalImage {
         source: bytes.as_ptr(),
@@ -179,9 +191,6 @@ pub unsafe extern "C" fn canvas_native_webgpu_queue_copy_context_to_texture(
 
     let (width, height) = context.context.dimensions();
 
-    let mut data = vec![0u8; (width * height * 4.) as usize];
-
-    context.context.get_pixels(data.as_mut_slice(), (0, 0), (width as i32, height as i32));
 
     let queue = &*queue;
     let queue_id = queue.queue.id;
@@ -190,6 +199,17 @@ pub unsafe extern "C" fn canvas_native_webgpu_queue_copy_context_to_texture(
 
     let destination_texture = &*destination.texture;
 
+    let mut data = vec![0u8; (width * height * 4.) as usize];
+
+    match destination_texture.format {
+        CanvasGPUTextureFormat::Bgra8Unorm | CanvasGPUTextureFormat::Bgra8UnormSrgb => {
+            context.context.get_pixels_format(data.as_mut_slice(), (0, 0), (width as i32, height as i32), canvas_2d::context::ColorType::BGRA8888);
+        }
+        _ => {
+            context.context.get_pixels(data.as_mut_slice(), (0, 0), (width as i32, height as i32));
+        }
+    }
+
     let destination_texture_id = destination_texture.texture;
 
     let size = *size;
@@ -265,7 +285,7 @@ pub unsafe extern "C" fn canvas_native_webgpu_queue_copy_image_asset_to_texture(
     }
     let image_asset = &*source.source;
     image_asset.with_bytes_dimension(|bytes, dimension| {
-        let ext_source = CanvasImageCopyExternalImage {
+        let mut ext_source = CanvasImageCopyExternalImage {
             source: bytes.as_ptr(),
             source_size: bytes.len(),
             origin: source.origin,
@@ -274,7 +294,23 @@ pub unsafe extern "C" fn canvas_native_webgpu_queue_copy_image_asset_to_texture(
             height: dimension.1,
         };
 
-        canvas_native_webgpu_queue_copy_external_image_to_texture(queue, &ext_source, destination, size);
+        {
+            let destination = &*destination;
+            let texture = &*destination.texture;
+            match texture.format {
+                CanvasGPUTextureFormat::Bgra8Unorm | CanvasGPUTextureFormat::Bgra8UnormSrgb => {
+                    let mut bytes = bytes.to_vec();
+                    canvas_core::image_asset::ImageAsset::rgba_to_bgra_in_place(bytes.as_mut_slice());
+
+                    ext_source.source = bytes.as_ptr();
+
+                    canvas_native_webgpu_queue_copy_external_image_to_texture(queue, &ext_source, destination, size);
+                }
+                _ => {
+                    canvas_native_webgpu_queue_copy_external_image_to_texture(queue, &ext_source, destination, size);
+                }
+            }
+        }
     });
 }
 

crates/canvas-core/src/image_asset.rs

@@ -977,6 +977,12 @@ use core_foundation::string::CFString;
         }
     }
 
+    pub fn rgba_to_bgra_in_place(data: &mut [u8]) {
+        for chunk in data.chunks_exact_mut(4) {
+            chunk.swap(0, 2);
+        }
+    }
+
 
     pub fn rgb565_to_rgba8888(data: &[u8]) -> Vec<u8> {
         let mut rgba_data = Vec::with_capacity(data.len() * 2);