- Use std::span<const uint8_t>

 - Clean up JNI local refs
 - Rethrow error in TexturedCube test

Author: bhamiltoncx

apps/example/src/Cube/TexturedCube.tsx

@@ -121,6 +121,7 @@ export const TexturedCube = () => {
         );
       } catch (err) {
         console.error("Failed to fetch asset", err);
+        throw err;
       }
 
       // Create a sampler with linear filtering for smooth interpolation.

packages/webgpu/android/cpp/AndroidPlatformContext.h

@@ -36,6 +36,8 @@ class AndroidPlatformContext : public PlatformContext {
 
     jmethodID resolveMethod = env->GetMethodID(blobModuleClass, "resolve",
                                                "(Ljava/lang/String;II)[B");
+    env->DeleteLocalRef(blobModuleClass);
+
     if (!resolveMethod) {
       throw std::runtime_error("Couldn't find resolve method in BlobModule");
     }
@@ -113,7 +115,7 @@ class AndroidPlatformContext : public PlatformContext {
     }).detach();
   }
 
-  ImageData createImageBitmapFromData(std::span<uint8_t> data) override {
+  ImageData createImageBitmapFromData(std::span<const uint8_t> data) override {
     jni::Environment::ensureCurrentThreadIsAttached();
 
     JNIEnv *env = facebook::jni::Environment::current();
@@ -132,12 +134,22 @@ class AndroidPlatformContext : public PlatformContext {
     // Decode via BitmapFactory
     jclass bitmapFactoryClass =
         env->FindClass("android/graphics/BitmapFactory");
+    if (!bitmapFactoryClass) {
+      env->DeleteLocalRef(byteArray);
+      throw std::runtime_error("Couldn't find BitmapFactory class");
+    }
     jmethodID decodeByteArrayMethod =
         env->GetStaticMethodID(bitmapFactoryClass, "decodeByteArray",
                                "([BII)Landroid/graphics/Bitmap;");
+    if (!decodeByteArrayMethod) {
+      env->DeleteLocalRef(byteArray);
+      env->DeleteLocalRef(bitmapFactoryClass);
+      throw std::runtime_error("Couldn't find decodeByteArray method");
+    }
     jint length = static_cast<jint>(data.size());
     jobject bitmap = env->CallStaticObjectMethod(
         bitmapFactoryClass, decodeByteArrayMethod, byteArray, 0, length);
+    env->DeleteLocalRef(bitmapFactoryClass);
 
     if (!bitmap) {
       env->DeleteLocalRef(byteArray);
@@ -175,7 +187,7 @@ class AndroidPlatformContext : public PlatformContext {
   }
 
   void createImageBitmapFromDataAsync(
-      std::span<uint8_t> data, std::function<void(ImageData)> onSuccess,
+      std::span<const uint8_t> data, std::function<void(ImageData)> onSuccess,
       std::function<void(std::string)> onError) override {
     std::thread([this, ownedData = std::vector<uint8_t>(data.begin(), data.end()),
                  onSuccess = std::move(onSuccess),

packages/webgpu/apple/ApplePlatformContext.h

@@ -21,10 +21,10 @@ class ApplePlatformContext : public PlatformContext {
       std::function<void(ImageData)> onSuccess,
       std::function<void(std::string)> onError) override;
 
-  ImageData createImageBitmapFromData(std::span<uint8_t> data) override;
+  ImageData createImageBitmapFromData(std::span<const uint8_t> data) override;
 
   void createImageBitmapFromDataAsync(
-      std::span<uint8_t> data, std::function<void(ImageData)> onSuccess,
+      std::span<const uint8_t> data, std::function<void(ImageData)> onSuccess,
       std::function<void(std::string)> onError) override;
 };
 

packages/webgpu/apple/ApplePlatformContext.mm

@@ -39,8 +39,8 @@ void checkIfUsingSimulatorWithAPIValidation() {
   return instance.CreateSurface(&surfaceDescriptor);
 }
 
-static std::span<uint8_t> nsDataToSpan(NSData *data) {
-  return {static_cast<uint8_t *>(const_cast<void *>(data.bytes)), data.length};
+static std::span<const uint8_t> nsDataToSpan(NSData *data) {
+  return {static_cast<const uint8_t *>(data.bytes), data.length};
 }
 
 ImageData ApplePlatformContext::createImageBitmap(std::string blobId,
@@ -83,7 +83,7 @@ void checkIfUsingSimulatorWithAPIValidation() {
 }
 
 ImageData ApplePlatformContext::createImageBitmapFromData(
-    std::span<uint8_t> data) {
+    std::span<const uint8_t> data) {
   NSData *nsData = [NSData dataWithBytes:data.data()
                                   length:data.size()];
 
@@ -128,7 +128,7 @@ void checkIfUsingSimulatorWithAPIValidation() {
 }
 
 void ApplePlatformContext::createImageBitmapFromDataAsync(
-    std::span<uint8_t> data, std::function<void(ImageData)> onSuccess,
+    std::span<const uint8_t> data, std::function<void(ImageData)> onSuccess,
     std::function<void(std::string)> onError) {
   // Copy span data into shared_ptr so the dispatch_async block owns the memory
   auto ownedData =

packages/webgpu/cpp/rnwgpu/PlatformContext.h

@@ -34,10 +34,10 @@ class PlatformContext {
       std::function<void(std::string)> onError) = 0;
 
   // Create ImageBitmap from raw encoded image bytes (PNG/JPEG/etc.)
-  virtual ImageData createImageBitmapFromData(std::span<uint8_t> data) = 0;
+  virtual ImageData createImageBitmapFromData(std::span<const uint8_t> data) = 0;
 
   virtual void createImageBitmapFromDataAsync(
-      std::span<uint8_t> data, std::function<void(ImageData)> onSuccess,
+      std::span<const uint8_t> data, std::function<void(ImageData)> onSuccess,
       std::function<void(std::string)> onError) = 0;
 };