Reuse SkSurface

XITRIX · Dec 7, 2024 · 775da6f · 775da6f
1 parent 5bbfed2
commit 775da6f
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 13 deletions.
diff --git a/Submodules/UIKit/include/platforms/ios/SkiaCtx_ios.h b/Submodules/UIKit/include/platforms/ios/SkiaCtx_ios.h
@@ -20,7 +20,8 @@ class SkiaCtx_ios : public SkiaCtx_sdlBase {
 
 private:
     sk_sp<GrDirectContext> context;
-
+    sk_sp<SkSurface> surface;
+
     void initContext();
 };
 

diff --git a/Submodules/UIKit/include/platforms/macos/SkiaCtx_macos.h b/Submodules/UIKit/include/platforms/macos/SkiaCtx_macos.h
@@ -15,7 +15,8 @@ class SkiaCtx_macos: public SkiaCtx_sdlBase {
     sk_sp<GrDirectContext> directContext() override { return context; }
 private:
     sk_sp<GrDirectContext> context;
-
+    sk_sp<SkSurface> surface;
+
     void initContext();
 };
 

diff --git a/Submodules/UIKit/lib/platforms/apple/ios/SkiaCtx_ios.mm b/Submodules/UIKit/lib/platforms/apple/ios/SkiaCtx_ios.mm
@@ -44,10 +44,9 @@
 
 sk_sp<SkSurface> SkiaCtx_ios::getBackbufferSurface() {
     auto size = getSize();
-    if (_size.width != size.width || _size.height != size.height) {
-        _size = size;
-        initContext();
-    }
+    if (_size.width == size.width && _size.height == size.height && surface != nullptr) { return surface; }
+
+    _size = size;
 
     GrGLFramebufferInfo framebuffer_info;
     framebuffer_info.fFormat = GL_RGBA8;
@@ -61,9 +60,11 @@
     SkSurfaceProps props;
 
     glViewport(0, 0, _size.width * scaleFactor, _size.height * scaleFactor);
-    return SkSurfaces::WrapBackendRenderTarget(context.get(), target,
+    surface = SkSurfaces::WrapBackendRenderTarget(context.get(), target,
                                                        kBottomLeft_GrSurfaceOrigin, kRGBA_8888_SkColorType,
                                                        nullptr, &props);
+
+    return surface;
 }
 
 std::unique_ptr<SkiaCtx> NXKit::MakeSkiaCtx() {

diff --git a/Submodules/UIKit/lib/platforms/apple/macos/SkiaCtx_macos.mm b/Submodules/UIKit/lib/platforms/apple/macos/SkiaCtx_macos.mm
@@ -44,10 +44,9 @@
 
 sk_sp<SkSurface> SkiaCtx_macos::getBackbufferSurface() {
     auto size = getSize();
-    if (_size.width != size.width || _size.height != size.height) {
-        _size = size;
-        initContext();
-    }
+    if (_size.width == size.width && _size.height == size.height && surface != nullptr) { return surface; }
+
+    _size = size;
 
     GrGLFramebufferInfo framebuffer_info;
     framebuffer_info.fFormat = GL_RGBA8;
@@ -61,9 +60,11 @@
     SkSurfaceProps props;
 
     glViewport(0, 0, _size.width * scaleFactor, _size.height * scaleFactor);
-    return SkSurfaces::WrapBackendRenderTarget(context.get(), target,
+    surface = SkSurfaces::WrapBackendRenderTarget(context.get(), target,
                                                kBottomLeft_GrSurfaceOrigin, kRGBA_8888_SkColorType,
                                                nullptr, &props);
+
+    return surface;
 }
 
 std::unique_ptr<SkiaCtx> NXKit::MakeSkiaCtx() {
@@ -74,4 +75,4 @@
     @autoreleasepool {
         return loop();
     }
-}
+}