Add texture support for macOS shell. #8507
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
|
|
||
|
||
| // Copyright 2013 The Flutter Authors. All rights reserved. | ||
| // Use of this source code is governed by a BSD-style license that can be | ||
| // found in the LICENSE file. | ||
|
|
||
| #import <CoreVideo/CoreVideo.h> | ||
| #import <Foundation/Foundation.h> | ||
|
|
||
| /** | ||
| * Implement a texture object for the FLE plugin side. | ||
| */ | ||
| @protocol FLETexture <NSObject> | ||
|
|
||
| /** | ||
| * When the texture on the platform side is ready, | ||
| * the flutter engine will copy the texture buffer | ||
| * using copyPixelBuffer. | ||
| */ | ||
| - (nullable CVPixelBufferRef)copyPixelBuffer:(size_t)width height:(size_t)height; | ||
|
|
||
| @end | ||
|
|
||
| /** | ||
| * The protocol for an object managing registration for texture. | ||
| */ | ||
| @protocol FLETextureRegistrar <NSObject> | ||
|
|
||
| /** | ||
| * Register a |texture| object and return a textureID. | ||
| */ | ||
| - (int64_t)registerTexture:(nonnull id<FLETexture>)texture; | ||
|
|
||
| /** | ||
| * Mark a texture buffer is ready. | ||
| */ | ||
| - (void)textureFrameAvailable:(int64_t)textureID; | ||
|
|
||
| /** | ||
| * Unregister an existing Texture object. | ||
| */ | ||
| - (void)unregisterTexture:(int64_t)textureID; | ||
|
|
||
| @end | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| // Copyright 2013 The Flutter Authors. All rights reserved. | ||
| // Use of this source code is governed by a BSD-style license that can be | ||
| // found in the LICENSE file. | ||
|
|
||
| #import <Foundation/Foundation.h> | ||
|
|
||
| #import "flutter/shell/platform/darwin/macos/framework/Headers/FLETexture.h" | ||
| #import "flutter/shell/platform/embedder/embedder.h" | ||
cloudwebrtc marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| /** | ||
| * Used to bridge FLETexture object and handle the texture copy request the | ||
| * flutter engine. | ||
| */ | ||
| @interface FLEExternalTextureGL : NSObject | ||
|
|
||
| /** | ||
| * Initializes a texture adapter with |texture| return a instance. | ||
| */ | ||
| - (nonnull instancetype)initWithFLETexture:(nonnull id<FLETexture>)texture; | ||
|
|
||
| /** | ||
| * Accepts texture buffer copy request from the flutter engine. | ||
| * When the user side marks the textureId as available, the flutter engine will | ||
| * callback to this method and ask for populate the |openGLTexture| object, | ||
| * such as the texture type and the format of the pixel buffer and the texture object. | ||
| */ | ||
| - (BOOL)populateTextureWithWidth:(size_t)width | ||
| height:(size_t)height | ||
| openGLTexture:(nonnull FlutterOpenGLTexture*)openGLTexture; | ||
|
|
||
| /** | ||
| * Returns the ID for the FLETexture instance. | ||
| */ | ||
| - (int64_t)textureID; | ||
|
|
||
| @end | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| // Copyright 2013 The Flutter Authors. All rights reserved. | ||
| // Use of this source code is governed by a BSD-style license that can be | ||
| // found in the LICENSE file. | ||
|
|
||
| #import "flutter/shell/platform/darwin/macos/framework/Source/FLEExternalTextureGL.h" | ||
|
||
|
|
||
| #import <AppKit/AppKit.h> | ||
| #import <CoreVideo/CoreVideo.h> | ||
| #import <OpenGL/gl.h> | ||
|
|
||
| static void OnGLTextureRelease(CVPixelBufferRef pixelBuffer) { | ||
| CVPixelBufferRelease(pixelBuffer); | ||
| } | ||
|
|
||
| @implementation FLEExternalTextureGL { | ||
| /** | ||
| * OpenGL texture cache. | ||
| */ | ||
| CVOpenGLTextureCacheRef _openGLTextureCache; | ||
| /** | ||
| * The pixel buffer copied from the user side will be released | ||
| * when the flutter engine renders it. | ||
| */ | ||
| CVPixelBufferRef _pixelBuffer; | ||
| /** | ||
| * User side texture object, used to copy pixel buffer. | ||
| */ | ||
| id<FLETexture> _texture; | ||
cloudwebrtc marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| - (instancetype)initWithFLETexture:(id<FLETexture>)texture { | ||
| self = [super init]; | ||
| if (self) { | ||
| _texture = texture; | ||
| } | ||
| return self; | ||
| } | ||
|
|
||
| - (int64_t)textureID { | ||
| return reinterpret_cast<int64_t>(self); | ||
| } | ||
|
|
||
| - (BOOL)populateTextureWithWidth:(size_t)width | ||
| height:(size_t)height | ||
| openGLTexture:(FlutterOpenGLTexture*)openGLTexture { | ||
| // Copy the pixel buffer from the FLETexture instance implemented on the user side. | ||
| _pixelBuffer = [_texture copyPixelBuffer:width height:height]; | ||
|
|
||
| if (!_pixelBuffer) { | ||
| return NO; | ||
| } | ||
|
|
||
| // Create the opengl texture cache if necessary. | ||
| if (!_openGLTextureCache) { | ||
| CGLContextObj context = [NSOpenGLContext currentContext].CGLContextObj; | ||
| CGLPixelFormatObj format = CGLGetPixelFormat(context); | ||
| if (CVOpenGLTextureCacheCreate(kCFAllocatorDefault, NULL, context, format, NULL, | ||
| &_openGLTextureCache) != kCVReturnSuccess) { | ||
| NSLog(@"Could not create texture cache."); | ||
| CVPixelBufferRelease(_pixelBuffer); | ||
| return NO; | ||
| } | ||
| } | ||
|
|
||
| // Try to clear the cache of OpenGL textures to save memory. | ||
| CVOpenGLTextureCacheFlush(_openGLTextureCache, 0); | ||
|
|
||
| CVOpenGLTextureRef cvOpenGLTexture = NULL; | ||
| if (CVOpenGLTextureCacheCreateTextureFromImage(kCFAllocatorDefault, _openGLTextureCache, | ||
| _pixelBuffer, NULL, | ||
| &cvOpenGLTexture) != kCVReturnSuccess) { | ||
| CVPixelBufferRelease(_pixelBuffer); | ||
| return NO; | ||
| } | ||
| CVPixelBufferRelease(_pixelBuffer); | ||
cloudwebrtc marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| openGLTexture->target = static_cast<uint32_t>(CVOpenGLTextureGetTarget(cvOpenGLTexture)); | ||
|
Member
There was a problem hiding this comment. @cloudwebrtc Are you saying that CVOpenGLTextureGetTarget is not returning GL_TEXTURE_RECTANGLE? I am a little bit confused. There should be no issues with having to convert to GL_TEXTURE_2D here.
Contributor
Author
There was a problem hiding this comment. @chinmaygarde See CVOpenGLTextureGetTarget from the code context
diff --git a/src/sksl/SkSLGLSLCodeGenerator.cpp b/src/sksl/SkSLGLSLCodeGenerator.cpp
index d003dc9397..04357e2a4c 100644
--- a/src/sksl/SkSLGLSLCodeGenerator.cpp
+++ b/src/sksl/SkSLGLSLCodeGenerator.cpp
@@ -656,7 +656,7 @@ void GLSLCodeGenerator::writeFunctionCall(const FunctionCall& c) {
proj = false;
break;
case SpvDimRect:
- dim = "Rect";
+ dim = "2DRect";
proj = false;
break;
case SpvDimBuffer:Then I can see the texture display, but the picture is not correct.
shell/platform/embedder/embedder.h#L214 Typedef bool (*TextureFrameCallback)(void* /* user data */,
Int64_t /* texture identifier */,
Size_t /* width */,
Size_t /* height */,
FlutterOpenGLTexture* /* texture out */);Looks like this: I am not sure that the type of dim in SpvDimRect is a bug in skia on macos. |
||
| openGLTexture->name = static_cast<uint32_t>(CVOpenGLTextureGetName(cvOpenGLTexture)); | ||
| openGLTexture->format = static_cast<uint32_t>(GL_RGBA8); | ||
| openGLTexture->destruction_callback = (VoidCallback)OnGLTextureRelease; | ||
| openGLTexture->user_data = cvOpenGLTexture; | ||
| return YES; | ||
| } | ||
|
|
||
| - (void)dealloc { | ||
| CVOpenGLTextureCacheRelease(_openGLTextureCache); | ||
| } | ||
|
|
||
| @end | ||
Uh oh!
There was an error while loading. Please reload this page.