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 @@ | ||
|
|
||
|
There was a problem hiding this comment. This appears to be identical to FlutterTexture.h other than the prefixes; now that macOS is in the same repo as iOS the goal is to share code whenever possible (and move away from the FLE prefix). You can just add that file to the (If you want to add these comments to FlutterTexture.h, ideally as a separate PR, that would be great, since the existing file isn't commented at all.) There was a problem hiding this comment. @chinmaygarde @stuartmorgan There was a problem hiding this comment. You should be able to specify that the texture target is GL_TEXTURE_RECTANGLE by specifying the target property of FlutterOpenGLTexture. All the copying ought to be unnecessarily inefficient. |
||
| // 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,32 @@ | ||
| // 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.
Show resolved
Hide resolved
|
||
|
|
||
| /** | ||
| * Used to bridge FLETexture object and handle the texture copy request. | ||
|
There was a problem hiding this comment. Please provide more context in this comment:
Providing some high-level explanation of how this class fits into the overall flow of passing textures back and forth wit the engine would be very helpful. |
||
| */ | ||
| @interface FLEExternalTextureGL : NSObject | ||
|
|
||
| /** | ||
| * Initializes a texture adapter with |texture| return a FLEExternalTextureGL. | ||
|
There was a problem hiding this comment. I'm having trouble parsing this comment; what is returning an FLEExternalTextureGL here? |
||
| */ | ||
| - (nonnull instancetype)initWithFLETexture:(nonnull id<FLETexture>)texture; | ||
|
|
||
| /** | ||
| * Accept texture buffer copy request from the flutter engine. | ||
cloudwebrtc marked this conversation as resolved.
Show resolved
Hide resolved
There was a problem hiding this comment. Please add more explanation to this comment:
|
||
| */ | ||
| - (BOOL)populateTextureWithWidth:(size_t)width | ||
| height:(size_t)height | ||
| texture:(nonnull FlutterOpenGLTexture*)texture; | ||
|
There was a problem hiding this comment. The uses of the word "texture" in this class (header and implementation) need disambiguation. The class itself is a texture, and accepts two different objects that are also textures. In this method, kind of texture is the parameter? (The type provides the answer here, but not at a call site). There was a problem hiding this comment. Looking more closely at the implementation, it looks like the texture being populated is the texture that is the last parameter; the current naming makes it sounds like some other internal texture is being populated from these arguments. As a general rule, you should never be naming the same parameter twice in the signature. So unless I'm misunderstanding, this should be |
||
|
|
||
| /** | ||
| * The texture ID. | ||
cloudwebrtc marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| */ | ||
| - (int64_t)textureID; | ||
|
|
||
| @end | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| // 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" | ||
|
There was a problem hiding this comment. Since we're moving away from using FLE as a prefix, and this code isn't part of an unstable public API surface, you can use Flutter rather than FLE as the prefix for this class, so that it doesn't need to be renamed later. |
||
|
|
||
| #import <AppKit/AppKit.h> | ||
| #import <CoreVideo/CoreVideo.h> | ||
| #import <OpenGL/gl.h> | ||
|
|
||
| @implementation FLEExternalTextureGL { | ||
| CVOpenGLTextureCacheRef _textureCache; | ||
| CVPixelBufferRef _pixelBuffer; | ||
| id<FLETexture> _texture; | ||
cloudwebrtc marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| - (instancetype)initWithFLETexture:(id<FLETexture>)texture { | ||
| self = [super init]; | ||
| if (self) { | ||
| _texture = texture; | ||
| _pixelBuffer = nil; | ||
| _textureCache = nil; | ||
cloudwebrtc marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
| return self; | ||
| } | ||
|
|
||
| static void OnGLTextureRelease(CVPixelBufferRef pixelBuffer) { | ||
cloudwebrtc marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| CVPixelBufferRelease(pixelBuffer); | ||
| } | ||
|
|
||
| - (int64_t)textureID { | ||
| return reinterpret_cast<int64_t>(self); | ||
| } | ||
|
|
||
| - (BOOL)populateTextureWithWidth:(size_t)width | ||
| height:(size_t)height | ||
| texture:(FlutterOpenGLTexture*)texture { | ||
| if (!_texture) { | ||
cloudwebrtc marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| return NO; | ||
| } | ||
|
|
||
| // Copy image buffer from external texture. | ||
| _pixelBuffer = [_texture copyPixelBuffer:width height:height]; | ||
|
|
||
| if (!_pixelBuffer) { | ||
| return NO; | ||
| } | ||
|
|
||
| // Create the texture cache if necessary. | ||
| if (!_textureCache) { | ||
| CGLContextObj context = [NSOpenGLContext currentContext].CGLContextObj; | ||
| CGLPixelFormatObj format = CGLGetPixelFormat(context); | ||
| if (CVOpenGLTextureCacheCreate(kCFAllocatorDefault, NULL, context, format, NULL, | ||
| &_textureCache) != kCVReturnSuccess) { | ||
| NSLog(@"Could not create texture cache."); | ||
| CVPixelBufferRelease(_pixelBuffer); | ||
| return NO; | ||
| } | ||
| } | ||
|
|
||
| // Try to clear the cache of OpenGL textures to save memory. | ||
| CVOpenGLTextureCacheFlush(_textureCache, 0); | ||
|
|
||
| CVOpenGLTextureRef openGLTexture = NULL; | ||
| if (CVOpenGLTextureCacheCreateTextureFromImage(kCFAllocatorDefault, _textureCache, _pixelBuffer, | ||
| NULL, &openGLTexture) != kCVReturnSuccess) { | ||
| CVPixelBufferRelease(_pixelBuffer); | ||
| return NO; | ||
| } | ||
|
|
||
| texture->target = static_cast<uint32_t>(CVOpenGLTextureGetTarget(openGLTexture)); | ||
| texture->name = static_cast<uint32_t>(CVOpenGLTextureGetName(openGLTexture)); | ||
| texture->format = static_cast<uint32_t>(GL_RGBA8); | ||
| texture->destruction_callback = reinterpret_cast<VoidCallback>(&OnGLTextureRelease); | ||
cloudwebrtc marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| texture->user_data = openGLTexture; | ||
|
|
||
| CVPixelBufferRelease(_pixelBuffer); | ||
cloudwebrtc marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| return YES; | ||
| } | ||
|
|
||
| - (void)dealloc { | ||
| CVOpenGLTextureCacheRelease(_textureCache); | ||
| } | ||
|
|
||
| @end | ||
Uh oh!
There was an error while loading. Please reload this page.