Skip to content

Commit b1e4f6d

Browse files
jwinarskesuryaKommana2662
authored andcommitted
Move the Vulkan wrapped-texture helper out of the GPU surface (flutter#193001)
`GPUSurfaceVulkanImpeller` carries a private `TextureSourceVK` subclass that wraps a `VkImage` the caller owns and creates a view for it. Nothing about it belongs to the root surface, and the embedder needs the same thing to build a render target from a backing store (flutter#187525). Move it to `impeller/renderer/backend/vulkan` as `WrapTextureSourceVK`. No behavior change; the surface loses 53 lines. ## Tests No new ones — this is a move. `gpu_surface_unittests` covers the surface that now calls it, including the transients-recreation test that exercises the wrapped image path. Third of six, from flutter#187525. The fifth needs this one. Conflicts textually with the second (same file), so whichever lands second wants a rebase.
1 parent 950667f commit b1e4f6d

4 files changed

Lines changed: 124 additions & 56 deletions

File tree

‎engine/src/flutter/impeller/renderer/backend/vulkan/BUILD.gn‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,8 @@ impeller_component("vulkan") {
138138
"texture_source_vk.h",
139139
"texture_vk.cc",
140140
"texture_vk.h",
141+
"texture_wrapper_vk.cc",
142+
"texture_wrapper_vk.h",
141143
"tracked_objects_vk.cc",
142144
"tracked_objects_vk.h",
143145
"vertex_descriptor_vk.cc",
Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
// Copyright 2013 The Flutter Authors. All rights reserved.
2+
// Use of this source code is governed by a BSD-style license that can be
3+
// found in the LICENSE file.
4+
5+
#include "impeller/renderer/backend/vulkan/texture_wrapper_vk.h"
6+
7+
#include <utility>
8+
9+
#include "flutter/fml/logging.h"
10+
#include "impeller/renderer/backend/vulkan/context_vk.h"
11+
#include "impeller/renderer/backend/vulkan/formats_vk.h"
12+
13+
namespace impeller {
14+
15+
namespace {
16+
17+
/// A texture source over a `VkImage` owned by someone else. Holds the image by
18+
/// value and owns only the view it creates for it.
19+
class WrappedTextureSourceVK final : public TextureSourceVK {
20+
public:
21+
WrappedTextureSourceVK(vk::Image image,
22+
vk::UniqueImageView image_view,
23+
TextureDescriptor desc)
24+
: TextureSourceVK(desc),
25+
image_(image),
26+
image_view_(std::move(image_view)) {}
27+
28+
~WrappedTextureSourceVK() override = default;
29+
30+
private:
31+
vk::Image GetImage() const override { return image_; }
32+
33+
vk::ImageView GetImageView() const override { return image_view_.get(); }
34+
35+
vk::ImageView GetRenderTargetView(uint32_t mip_level,
36+
uint32_t array_layer) const override {
37+
return image_view_.get();
38+
}
39+
40+
bool IsSwapchainImage() const override { return true; }
41+
42+
vk::Image image_;
43+
vk::UniqueImageView image_view_;
44+
45+
WrappedTextureSourceVK(const WrappedTextureSourceVK&) = delete;
46+
WrappedTextureSourceVK& operator=(const WrappedTextureSourceVK&) = delete;
47+
};
48+
49+
} // namespace
50+
51+
std::shared_ptr<TextureSourceVK> WrapTextureSourceVK(
52+
const std::shared_ptr<Context>& context,
53+
const TextureDescriptor& desc,
54+
vk::Image image) {
55+
if (!context || !image) {
56+
return nullptr;
57+
}
58+
59+
vk::ImageViewCreateInfo view_info = {};
60+
view_info.viewType = vk::ImageViewType::e2D;
61+
view_info.format = ToVKImageFormat(desc.format);
62+
view_info.subresourceRange.aspectMask = vk::ImageAspectFlagBits::eColor;
63+
view_info.subresourceRange.baseMipLevel = 0u;
64+
view_info.subresourceRange.baseArrayLayer = 0u;
65+
view_info.subresourceRange.levelCount = 1;
66+
view_info.subresourceRange.layerCount = 1;
67+
view_info.image = image;
68+
69+
auto [result, image_view] =
70+
ContextVK::Cast(*context).GetDevice().createImageViewUnique(view_info);
71+
if (result != vk::Result::eSuccess) {
72+
FML_LOG(ERROR) << "Failed to create image view for wrapped image: "
73+
<< vk::to_string(result);
74+
return nullptr;
75+
}
76+
77+
return std::make_shared<WrappedTextureSourceVK>(image, std::move(image_view),
78+
desc);
79+
}
80+
81+
} // namespace impeller
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
// Copyright 2013 The Flutter Authors. All rights reserved.
2+
// Use of this source code is governed by a BSD-style license that can be
3+
// found in the LICENSE file.
4+
5+
#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_TEXTURE_WRAPPER_VK_H_
6+
#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_TEXTURE_WRAPPER_VK_H_
7+
8+
#include <memory>
9+
10+
#include "impeller/core/texture.h"
11+
#include "impeller/core/texture_descriptor.h"
12+
#include "impeller/renderer/backend/vulkan/texture_source_vk.h"
13+
#include "impeller/renderer/backend/vulkan/vk.h"
14+
#include "impeller/renderer/context.h"
15+
16+
namespace impeller {
17+
18+
/// @brief Wrap a `VkImage` Impeller does not own as a texture source.
19+
///
20+
/// The image is not owned, not transitioned and not destroyed here;
21+
/// the caller guarantees it outlives the returned source and is in
22+
/// a layout the intended usage allows. An image view is created for
23+
/// it and owned by the returned source.
24+
///
25+
/// Returns nullptr if the view could not be created.
26+
///
27+
/// @see `WrapTextureMTL`, the Metal equivalent.
28+
std::shared_ptr<TextureSourceVK> WrapTextureSourceVK(
29+
const std::shared_ptr<Context>& context,
30+
const TextureDescriptor& desc,
31+
vk::Image image);
32+
33+
} // namespace impeller
34+
35+
#endif // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_TEXTURE_WRAPPER_VK_H_

‎engine/src/flutter/shell/gpu/gpu_surface_vulkan_impeller.cc‎

Lines changed: 6 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -16,43 +16,13 @@
1616
#include "impeller/renderer/backend/vulkan/context_vk.h"
1717
#include "impeller/renderer/backend/vulkan/surface_context_vk.h"
1818
#include "impeller/renderer/backend/vulkan/swapchain/surface_vk.h"
19+
#include "impeller/renderer/backend/vulkan/texture_wrapper_vk.h"
1920
#include "impeller/renderer/render_target.h"
2021
#include "impeller/renderer/surface.h"
2122
#include "impeller/typographer/backends/skia/typographer_context_skia.h"
2223

2324
namespace flutter {
2425

25-
class WrappedTextureSourceVK : public impeller::TextureSourceVK {
26-
public:
27-
explicit WrappedTextureSourceVK(impeller::vk::Image image,
28-
impeller::vk::UniqueImageView image_view,
29-
impeller::TextureDescriptor desc)
30-
: TextureSourceVK(desc),
31-
image_(image),
32-
image_view_(std::move(image_view)) {}
33-
34-
~WrappedTextureSourceVK() override = default;
35-
36-
private:
37-
impeller::vk::Image GetImage() const override { return image_; }
38-
39-
impeller::vk::ImageView GetImageView() const override {
40-
return image_view_.get();
41-
}
42-
43-
impeller::vk::ImageView GetRenderTargetView(
44-
uint32_t mip_level,
45-
uint32_t array_layer) const override {
46-
// Swapchain images are always a single 2D mip and layer.
47-
return image_view_.get();
48-
}
49-
50-
bool IsSwapchainImage() const override { return true; }
51-
52-
impeller::vk::Image image_;
53-
impeller::vk::UniqueImageView image_view_;
54-
};
55-
5626
GPUSurfaceVulkanImpeller::GPUSurfaceVulkanImpeller(
5727
GPUSurfaceVulkanDelegate* delegate,
5828
std::shared_ptr<impeller::Context> context,
@@ -180,9 +150,6 @@ std::unique_ptr<SurfaceFrame> GPUSurfaceVulkanImpeller::AcquireFrame(
180150
return nullptr;
181151
}
182152

183-
impeller::ContextVK& context_vk =
184-
impeller::ContextVK::Cast(*impeller_context_);
185-
186153
impeller::vk::Image vk_image =
187154
impeller::vk::Image(reinterpret_cast<VkImage>(flutter_image.image));
188155

@@ -194,22 +161,9 @@ std::unique_ptr<SurfaceFrame> GPUSurfaceVulkanImpeller::AcquireFrame(
194161
desc.compression_type = impeller::CompressionType::kLossless;
195162
desc.usage = impeller::TextureUsage::kRenderTarget;
196163

197-
impeller::vk::ImageViewCreateInfo view_info = {};
198-
view_info.viewType = impeller::vk::ImageViewType::e2D;
199-
view_info.format = ToVKImageFormat(desc.format);
200-
view_info.subresourceRange.aspectMask =
201-
impeller::vk::ImageAspectFlagBits::eColor;
202-
view_info.subresourceRange.baseMipLevel = 0u;
203-
view_info.subresourceRange.baseArrayLayer = 0u;
204-
view_info.subresourceRange.levelCount = 1;
205-
view_info.subresourceRange.layerCount = 1;
206-
view_info.image = vk_image;
207-
208-
auto [result, image_view] =
209-
context_vk.GetDevice().createImageViewUnique(view_info);
210-
if (result != impeller::vk::Result::eSuccess) {
211-
FML_LOG(ERROR) << "Failed to create image view for provided image: "
212-
<< impeller::vk::to_string(result);
164+
auto wrapped_onscreen =
165+
impeller::WrapTextureSourceVK(impeller_context_, desc, vk_image);
166+
if (!wrapped_onscreen) {
213167
return nullptr;
214168
}
215169

@@ -221,8 +175,6 @@ std::unique_ptr<SurfaceFrame> GPUSurfaceVulkanImpeller::AcquireFrame(
221175
transients_size_ = frame_size;
222176
}
223177

224-
auto wrapped_onscreen = std::make_shared<WrappedTextureSourceVK>(
225-
vk_image, std::move(image_view), desc);
226178
auto surface = impeller::SurfaceVK::WrapSwapchainImage(
227179
transients_, wrapped_onscreen, [&]() -> bool { return true; });
228180
impeller::RenderTarget render_target = surface->GetRenderTarget();
@@ -259,12 +211,10 @@ std::unique_ptr<SurfaceFrame> GPUSurfaceVulkanImpeller::AcquireFrame(
259211
TRACE_EVENT0("flutter", "GPUSurfaceVulkan::PresentImage");
260212

261213
{
262-
const auto& context = impeller::ContextVK::Cast(*impeller_context);
263-
264214
//----------------------------------------------------------------------------
265215
/// Transition the image to color-attachment-optimal.
266216
///
267-
auto cmd_buffer = context.CreateCommandBuffer();
217+
auto cmd_buffer = impeller_context->CreateCommandBuffer();
268218

269219
auto vk_final_cmd_buffer =
270220
impeller::CommandBufferVK::Cast(*cmd_buffer).GetCommandBuffer();
@@ -285,7 +235,7 @@ std::unique_ptr<SurfaceFrame> GPUSurfaceVulkanImpeller::AcquireFrame(
285235
return false;
286236
}
287237
}
288-
if (!context.GetCommandQueue()->Submit({cmd_buffer}).ok()) {
238+
if (!impeller_context->GetCommandQueue()->Submit({cmd_buffer}).ok()) {
289239
return false;
290240
}
291241
}

0 commit comments

Comments
 (0)