@shopify/react-native-skia 2.6.8 → 2.6.9

package/android/cpp/rnskia-android/OpenGLContext.h

@@ -119,27 +119,34 @@ public:
     AHardwareBuffer_Desc description;
     AHardwareBuffer_describe(hardwareBuffer, &description);
     GrBackendFormat format;
+    auto colorType = kRGBA_8888_SkColorType;
     switch (description.format) {
     // TODO: find out if we can detect, which graphic buffers support
     // GR_GL_TEXTURE_2D
     case AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM:
       format = GrBackendFormats::MakeGL(GR_GL_RGBA8, GR_GL_TEXTURE_EXTERNAL);
+      colorType = kRGBA_8888_SkColorType;
       break;
     case AHARDWAREBUFFER_FORMAT_R16G16B16A16_FLOAT:
       format = GrBackendFormats::MakeGL(GR_GL_RGBA16F, GR_GL_TEXTURE_EXTERNAL);
+      colorType = kRGBA_F16_SkColorType;
       break;
     case AHARDWAREBUFFER_FORMAT_R5G6B5_UNORM:
-      GrBackendFormats::MakeGL(GR_GL_RGB565, GR_GL_TEXTURE_EXTERNAL);
+      format = GrBackendFormats::MakeGL(GR_GL_RGB565, GR_GL_TEXTURE_EXTERNAL);
+      colorType = kRGB_565_SkColorType;
       break;
     case AHARDWAREBUFFER_FORMAT_R10G10B10A2_UNORM:
       format = GrBackendFormats::MakeGL(GR_GL_RGB10_A2, GR_GL_TEXTURE_EXTERNAL);
+      colorType = kRGBA_1010102_SkColorType;
       break;
     case AHARDWAREBUFFER_FORMAT_R8G8B8_UNORM:
       format = GrBackendFormats::MakeGL(GR_GL_RGB8, GR_GL_TEXTURE_EXTERNAL);
+      colorType = kRGB_888x_SkColorType;
       break;
 #if __ANDROID_API__ >= 33
     case AHARDWAREBUFFER_FORMAT_R8_UNORM:
       format = GrBackendFormats::MakeGL(GR_GL_R8, GR_GL_TEXTURE_EXTERNAL);
+      colorType = kAlpha_8_SkColorType;
       break;
 #endif
     default:
@@ -161,9 +168,8 @@ public:
       return nullptr;
     }
     sk_sp<SkImage> image = SkImages::BorrowTextureFrom(
-        _directContext.get(), backendTex, kTopLeft_GrSurfaceOrigin,
-        kRGBA_8888_SkColorType, kOpaque_SkAlphaType, nullptr, deleteImageProc,
-        deleteImageCtx);
+        _directContext.get(), backendTex, kTopLeft_GrSurfaceOrigin, colorType,
+        kOpaque_SkAlphaType, nullptr, deleteImageProc, deleteImageCtx);
     return image;
 #else
     throw std::runtime_error(

package/apple/SkiaCVPixelBufferUtils.mm

@@ -105,6 +105,8 @@ SkiaCVPixelBufferUtils::getCVPixelBufferBaseFormat(
   case kCVPixelFormatType_32BGRA:
   case kCVPixelFormatType_32ABGR:
   case kCVPixelFormatType_32RGBA:
+  // 16-bit half-float RGBA
+  case kCVPixelFormatType_64RGBAHalf:
     return CVPixelBufferBaseFormat::rgb;
   default:
     [[unlikely]] throw std::runtime_error(
@@ -125,6 +127,8 @@ SkColorType SkiaCVPixelBufferUtils::RGB::getCVPixelBufferColorType(
     [[likely]] return kBGRA_8888_SkColorType;
   case kCVPixelFormatType_32RGBA:
     return kRGBA_8888_SkColorType;
+  case kCVPixelFormatType_64RGBAHalf:
+    return kRGBA_F16_SkColorType;
   // This can be extended with branches for specific RGB formats if Apple
   // uses new formats.
   default:
@@ -444,6 +448,12 @@ MTLPixelFormat SkiaCVPixelBufferUtils::getMTLPixelFormatForCVPixelBufferPlane(
       return throwInvalidPlaneIndexForFormat(1);
     }
     return MTLPixelFormatRGBA8Unorm;
+  case kCVPixelFormatType_64RGBAHalf:
+    // 1 plane, 16-bit half-float interleaved RGBA.
+    if (planeIndex != 0) {
+      return throwInvalidPlaneIndexForFormat(1);
+    }
+    return MTLPixelFormatRGBA16Float;
   case kCVPixelFormatType_420YpCbCr8Planar:
   case kCVPixelFormatType_420YpCbCr8PlanarFullRange:
     // 3 planes, 8-bit 4:2:0 planar (Y, U, V), each plane is single channel.

package/package.json

@@ -8,7 +8,7 @@
     "setup-skia-web": "scripts/setup-canvaskit.js"
   },
   "title": "React Native Skia",
-  "version": "2.6.8",
+  "version": "2.6.9",
   "description": "High-performance React Native Graphics using Skia",
   "main": "lib/module/index.js",
   "react-native": "src/index.ts",