Merge branch 'main' into terrysahaidak/chat-example

Shopify · Nov 30, 2024 · f6f7cc5 · f6f7cc5
2 parents 3ea6cdd + 3401111
commit f6f7cc5
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/packages/skia/android/cpp/rnskia-android/OpenGLContext.h b/packages/skia/android/cpp/rnskia-android/OpenGLContext.h
@@ -26,8 +26,8 @@ class OpenGLSharedContext {
     return instance;
   }
 
-  gl::Display* getDisplay() { return _glDisplay.get(); }
-  gl::Context* getContext() { return _glContext.get(); }
+  gl::Display *getDisplay() { return _glDisplay.get(); }
+  gl::Context *getContext() { return _glContext.get(); }
 
 private:
   std::unique_ptr<gl::Display> _glDisplay;
@@ -63,8 +63,11 @@ class OpenGLContext {
     }
 
     // Create texture
+    auto GL_RGBA8 = 0x8058;
+    auto format = GrBackendFormats::MakeGL(GL_RGBA8, GL_TEXTURE_2D);
     auto texture = _directContext->createBackendTexture(
-        width, height, colorType, skgpu::Mipmapped::kNo, GrRenderable::kYes);
+        width, height, format, SkColors::kTransparent, skgpu::Mipmapped::kNo,
+        GrRenderable::kYes);
 
     if (!texture.isValid()) {
       RNSkLogger::logToConsole("couldn't create offscreen texture %dx%d", width,
@@ -153,8 +156,8 @@ class OpenGLContext {
   std::unique_ptr<WindowContext> MakeWindow(ANativeWindow *window, int width,
                                             int height) {
     auto display = OpenGLSharedContext::getInstance().getDisplay();
-    return std::make_unique<OpenGLWindowContext>(
-        _directContext.get(), display, _glContext.get(), window);
+    return std::make_unique<OpenGLWindowContext>(_directContext.get(), display,
+                                                 _glContext.get(), window);
   }
 
   GrDirectContext *getDirectContext() { return _directContext.get(); }
@@ -180,4 +183,4 @@ class OpenGLContext {
   }
 };
 
-} // namespace RNSkia
+} // namespace RNSkia