DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Reuse texture cache in ios_external_texture_gl. (#9806)" (flutter/engine#11522)

Browse Source 
Broke iOS builds:

    ../../flutter/shell/platform/darwin/ios/ios_external_texture_gl.mm:56:28: error: out-of-line definition of 'NeedUpdateTexture' does not match any declaration in 'flutter::IOSExternalTextureGL'
    bool IOSExternalTextureGL::NeedUpdateTexture(bool freeze) {
                           ^~~~~~~~~~~~~~~~~

This reverts commit 5dfdb4ac99547b4f01c19fcd4e4e80238b91854b.
This commit is contained in:
Chris Bracken 2019-08-27 09:39:48 -07:00 committed by GitHub
parent 5dfdb4ac99
commit 8a25f39d85
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engine/src/flutter/shell/platform/darwin/ios/ios_external_texture_gl.h
View File

@ -31,7 +31,6 @@ class IOSExternalTextureGL : public flutter::Texture {
void EnsureTextureCacheExists();
bool new_frame_ready_ = false;
NSObject<FlutterTexture>* external_texture_;
fml::CFRef<CVOpenGLESTextureCacheRef> cache_ref_;
fml::CFRef<CVOpenGLESTextureRef> texture_ref_;

13
engine/src/flutter/shell/platform/darwin/ios/ios_external_texture_gl.mm
View File

@ -53,24 +53,17 @@ void IOSExternalTextureGL::CreateTextureFromPixelBuffer() {
}
}
bool IOSExternalTextureGL::NeedUpdateTexture(bool freeze) {
// Update texture if `texture_ref_` is reset to `nullptr` when GrContext
// is destroied or new frame is ready.
return (!freeze && new_frame_ready_) || !texture_ref_;
}
void IOSExternalTextureGL::Paint(SkCanvas& canvas,
const SkRect& bounds,
bool freeze,
GrContext* context) {
EnsureTextureCacheExists();
if (NeedUpdateTexture(freeze)) {
if (!freeze) {
auto pixelBuffer = [external_texture_ copyPixelBuffer];
if (pixelBuffer) {
buffer_ref_.Reset(pixelBuffer);
}
CreateTextureFromPixelBuffer();
new_frame_ready_ = false;
}
if (!texture_ref_) {
return;
@ -100,8 +93,6 @@ void IOSExternalTextureGL::OnGrContextDestroyed() {
cache_ref_.Reset(nullptr);
}
void IOSExternalTextureGL::MarkNewFrameAvailable() {
new_frame_ready_ = true;
}
void IOSExternalTextureGL::MarkNewFrameAvailable() {}
} // namespace flutter