|
5 | 5 | #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterCompositor.h" |
6 | 6 |
|
7 | 7 | #include "flutter/fml/logging.h" |
8 | | -#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterIOSurfaceHolder.h" |
9 | 8 |
|
10 | 9 | namespace flutter { |
11 | 10 |
|
12 | 11 | FlutterCompositor::FlutterCompositor(id<FlutterViewProvider> view_provider, |
13 | | - FlutterPlatformViewController* platform_view_controller, |
14 | | - id<MTLDevice> mtl_device) |
15 | | - : view_provider_(view_provider), |
16 | | - platform_view_controller_(platform_view_controller), |
17 | | - mtl_device_(mtl_device) { |
| 12 | + FlutterPlatformViewController* platform_view_controller) |
| 13 | + : view_provider_(view_provider), platform_view_controller_(platform_view_controller) { |
18 | 14 | FML_CHECK(view_provider != nullptr) << "view_provider cannot be nullptr"; |
19 | 15 | } |
20 | 16 |
|
|
23 | 19 | // TODO(dkwingsmt): This class only supports single-view for now. As more |
24 | 20 | // classes are gradually converted to multi-view, it should get the view ID |
25 | 21 | // from somewhere. |
26 | | - FlutterView* view = GetView(kFlutterDefaultViewId); |
| 22 | + FlutterView* view = [view_provider_ getView:kFlutterDefaultViewId]; |
27 | 23 | if (!view) { |
28 | 24 | return false; |
29 | 25 | } |
30 | 26 |
|
31 | 27 | CGSize size = CGSizeMake(config->size.width, config->size.height); |
32 | | - |
33 | | - backing_store_out->metal.struct_size = sizeof(FlutterMetalBackingStore); |
34 | | - backing_store_out->metal.texture.struct_size = sizeof(FlutterMetalTexture); |
35 | | - |
36 | | - if (GetFrameStatus() != FrameStatus::kStarted) { |
37 | | - StartFrame(); |
38 | | - // If the backing store is for the first layer, return the MTLTexture for the |
39 | | - // FlutterView. |
40 | | - FlutterRenderBackingStore* backingStore = [view backingStoreForSize:size]; |
41 | | - backing_store_out->metal.texture.texture = |
42 | | - (__bridge FlutterMetalTextureHandle)backingStore.texture; |
43 | | - } else { |
44 | | - FlutterIOSurfaceHolder* io_surface_holder = [[FlutterIOSurfaceHolder alloc] init]; |
45 | | - [io_surface_holder recreateIOSurfaceWithSize:size]; |
46 | | - auto texture_descriptor = |
47 | | - [MTLTextureDescriptor texture2DDescriptorWithPixelFormat:MTLPixelFormatBGRA8Unorm |
48 | | - width:size.width |
49 | | - height:size.height |
50 | | - mipmapped:NO]; |
51 | | - texture_descriptor.usage = |
52 | | - MTLTextureUsageShaderRead | MTLTextureUsageRenderTarget | MTLTextureUsageShaderWrite; |
53 | | - |
54 | | - backing_store_out->metal.texture.texture = (__bridge_retained FlutterMetalTextureHandle) |
55 | | - [mtl_device_ newTextureWithDescriptor:texture_descriptor |
56 | | - iosurface:[io_surface_holder ioSurface] |
57 | | - plane:0]; |
58 | | - |
59 | | - backing_store_out->metal.texture.user_data = (__bridge_retained void*)io_surface_holder; |
60 | | - } |
61 | | - |
| 28 | + FlutterSurface* surface = [view.surfaceManager surfaceForSize:size]; |
| 29 | + memset(backing_store_out, 0, sizeof(FlutterBackingStore)); |
| 30 | + backing_store_out->struct_size = sizeof(FlutterBackingStore); |
62 | 31 | backing_store_out->type = kFlutterBackingStoreTypeMetal; |
63 | | - backing_store_out->metal.texture.destruction_callback = [](void* user_data) { |
64 | | - if (user_data != nullptr) { |
65 | | - CFRelease(user_data); |
66 | | - } |
67 | | - }; |
68 | | - |
69 | | - return true; |
70 | | -} |
71 | | - |
72 | | -bool FlutterCompositor::CollectBackingStore(const FlutterBackingStore* backing_store) { |
73 | | - // If we allocated this MTLTexture ourselves, user_data is not null, and we will need |
74 | | - // to release it manually. |
75 | | - if (backing_store->metal.texture.user_data != nullptr && |
76 | | - backing_store->metal.texture.texture != nullptr) { |
77 | | - CFRelease(backing_store->metal.texture.texture); |
78 | | - } |
| 32 | + backing_store_out->metal.struct_size = sizeof(FlutterMetalBackingStore); |
| 33 | + backing_store_out->metal.texture = surface.asFlutterMetalTexture; |
79 | 34 | return true; |
80 | 35 | } |
81 | 36 |
|
82 | 37 | bool FlutterCompositor::Present(uint64_t view_id, |
83 | 38 | const FlutterLayer** layers, |
84 | 39 | size_t layers_count) { |
85 | | - FlutterView* view = GetView(view_id); |
| 40 | + FlutterView* view = [view_provider_ getView:view_id]; |
86 | 41 | if (!view) { |
87 | 42 | return false; |
88 | 43 | } |
89 | 44 |
|
90 | | - SetFrameStatus(FrameStatus::kPresenting); |
91 | | - |
92 | | - bool has_flutter_content = false; |
93 | | - for (size_t i = 0; i < layers_count; ++i) { |
94 | | - const auto* layer = layers[i]; |
95 | | - FlutterBackingStore* backing_store = const_cast<FlutterBackingStore*>(layer->backing_store); |
96 | | - |
97 | | - switch (layer->type) { |
98 | | - case kFlutterLayerContentTypeBackingStore: { |
99 | | - if (backing_store->metal.texture.user_data) { |
100 | | - FlutterIOSurfaceHolder* io_surface_holder = |
101 | | - (__bridge FlutterIOSurfaceHolder*)backing_store->metal.texture.user_data; |
102 | | - IOSurfaceRef io_surface = [io_surface_holder ioSurface]; |
103 | | - InsertCALayerForIOSurface(view, io_surface); |
104 | | - } |
105 | | - has_flutter_content = true; |
106 | | - break; |
107 | | - } |
108 | | - case kFlutterLayerContentTypePlatformView: { |
109 | | - PresentPlatformView(view, layer, i); |
110 | | - break; |
| 45 | + NSMutableArray* surfaces = [NSMutableArray array]; |
| 46 | + for (size_t i = 0; i < layers_count; i++) { |
| 47 | + FlutterLayer* layer = (FlutterLayer*)layers[i]; |
| 48 | + if (layer->type == kFlutterLayerContentTypeBackingStore) { |
| 49 | + FlutterSurface* surface = |
| 50 | + [view.surfaceManager lookupSurface:&layer->backing_store->metal.texture]; |
| 51 | + if (surface) { |
| 52 | + FlutterSurfacePresentInfo* info = [[FlutterSurfacePresentInfo alloc] init]; |
| 53 | + info.surface = surface; |
| 54 | + info.offset = CGPointMake(layer->offset.x, layer->offset.y); |
| 55 | + info.zIndex = i; |
| 56 | + [surfaces addObject:info]; |
111 | 57 | } |
112 | | - }; |
| 58 | + } |
113 | 59 | } |
114 | 60 |
|
115 | | - return EndFrame(has_flutter_content); |
| 61 | + [view.surfaceManager present:surfaces |
| 62 | + notify:^{ |
| 63 | + for (size_t i = 0; i < layers_count; i++) { |
| 64 | + FlutterLayer* layer = (FlutterLayer*)layers[i]; |
| 65 | + if (layer->type == kFlutterLayerContentTypePlatformView) { |
| 66 | + PresentPlatformView(view, layer, i); |
| 67 | + } |
| 68 | + } |
| 69 | + [platform_view_controller_ disposePlatformViews]; |
| 70 | + }]; |
| 71 | + |
| 72 | + return true; |
116 | 73 | } |
117 | 74 |
|
118 | 75 | void FlutterCompositor::PresentPlatformView(FlutterView* default_base_view, |
119 | 76 | const FlutterLayer* layer, |
120 | 77 | size_t layer_position) { |
121 | | - // TODO (https://github.com/flutter/flutter/issues/96668) |
122 | | - // once the issue is fixed, this check will pass. |
123 | 78 | FML_DCHECK([[NSThread currentThread] isMainThread]) |
124 | 79 | << "Must be on the main thread to present platform views"; |
125 | 80 |
|
|
128 | 83 |
|
129 | 84 | FML_DCHECK(platform_view) << "Platform view not found for id: " << platform_view_id; |
130 | 85 |
|
131 | | - CGFloat scale = [[NSScreen mainScreen] backingScaleFactor]; |
| 86 | + CGFloat scale = platform_view.layer.contentsScale; |
132 | 87 | platform_view.frame = CGRectMake(layer->offset.x / scale, layer->offset.y / scale, |
133 | 88 | layer->size.width / scale, layer->size.height / scale); |
134 | 89 | if (platform_view.superview == nil) { |
135 | 90 | [default_base_view addSubview:platform_view]; |
| 91 | + [default_base_view.layer addSublayer:platform_view.layer]; |
136 | 92 | } |
137 | 93 | platform_view.layer.zPosition = layer_position; |
138 | 94 | } |
139 | 95 |
|
140 | | -void FlutterCompositor::SetPresentCallback( |
141 | | - const FlutterCompositor::PresentCallback& present_callback) { |
142 | | - present_callback_ = present_callback; |
143 | | -} |
144 | | - |
145 | | -void FlutterCompositor::StartFrame() { |
146 | | - // First remove all CALayers from the superlayer. |
147 | | - for (auto layer : active_ca_layers_) { |
148 | | - [layer removeFromSuperlayer]; |
149 | | - } |
150 | | - |
151 | | - // Reset active layers. |
152 | | - active_ca_layers_.clear(); |
153 | | - SetFrameStatus(FrameStatus::kStarted); |
154 | | -} |
155 | | - |
156 | | -bool FlutterCompositor::EndFrame(bool has_flutter_content) { |
157 | | - bool status = present_callback_(has_flutter_content); |
158 | | - SetFrameStatus(FrameStatus::kEnded); |
159 | | - return status; |
160 | | -} |
161 | | - |
162 | | -FlutterView* FlutterCompositor::GetView(uint64_t view_id) { |
163 | | - return [view_provider_ getView:view_id]; |
164 | | -} |
165 | | - |
166 | | -void FlutterCompositor::SetFrameStatus(FlutterCompositor::FrameStatus frame_status) { |
167 | | - frame_status_ = frame_status; |
168 | | -} |
169 | | - |
170 | | -FlutterCompositor::FrameStatus FlutterCompositor::GetFrameStatus() { |
171 | | - return frame_status_; |
172 | | -} |
173 | | - |
174 | | -void FlutterCompositor::InsertCALayerForIOSurface(FlutterView* view, |
175 | | - const IOSurfaceRef& io_surface, |
176 | | - CATransform3D transform) { |
177 | | - // FlutterCompositor manages the lifecycle of CALayers. |
178 | | - CALayer* content_layer = [[CALayer alloc] init]; |
179 | | - content_layer.transform = transform; |
180 | | - content_layer.frame = view.layer.bounds; |
181 | | - [content_layer setContents:(__bridge id)io_surface]; |
182 | | - [view.layer addSublayer:content_layer]; |
183 | | - |
184 | | - active_ca_layers_.push_back(content_layer); |
185 | | -} |
186 | | - |
187 | 96 | } // namespace flutter |
0 commit comments