firka/flutter
firka/flutter
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename GetTargetRenderPassDescriptor to GetRenderTarget. (flutter/engine#55765)

Browse Source 
Closes https://github.com/flutter/flutter/issues/154799.
This commit is contained in:
Matan Lurey 2024-10-09 08:44:41 -07:00 committed by GitHub
parent 9123b89cc0
commit d62fed45f7
8 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/src/flutter/impeller/playground/playground.cc
View File

@ -263,7 +263,7 @@ bool Playground::OpenPlaygroundHere(
ImGui_ImplGlfw_NewFrame();
auto surface = impl_->AcquireSurfaceFrame(context_);
RenderTarget render_target = surface->GetTargetRenderPassDescriptor();
RenderTarget render_target = surface->GetRenderTarget();
ImGui::NewFrame();
ImGui::DockSpaceOverViewport(ImGui::GetMainViewport(),

6
engine/src/flutter/impeller/renderer/backend/vulkan/test/swapchain_unittests.cc
View File

@ -72,7 +72,7 @@ TEST(SwapchainTest, CachesRenderPassOnSwapchainImage) {
std::vector<std::shared_ptr<Texture>> depth_stencil_textures;
for (auto i = 0u; i < 3u; i++) {
auto drawable = swapchain->AcquireNextDrawable();
RenderTarget render_target = drawable->GetTargetRenderPassDescriptor();
RenderTarget render_target = drawable->GetRenderTarget();
auto texture = render_target.GetRenderTargetTexture();
auto& texture_vk = TextureVK::Cast(*texture);
@ -102,7 +102,7 @@ TEST(SwapchainTest, CachesRenderPassOnSwapchainImage) {
std::vector<SharedHandleVK<vk::RenderPass>> render_passes;
for (auto i = 0u; i < 3u; i++) {
auto drawable = swapchain->AcquireNextDrawable();
RenderTarget render_target = drawable->GetTargetRenderPassDescriptor();
RenderTarget render_target = drawable->GetRenderTarget();
auto texture = render_target.GetRenderTargetTexture();
auto& texture_vk = TextureVK::Cast(*texture);
@ -117,7 +117,7 @@ TEST(SwapchainTest, CachesRenderPassOnSwapchainImage) {
// unchanged.
for (auto i = 0u; i < 3u; i++) {
auto drawable = swapchain->AcquireNextDrawable();
RenderTarget render_target = drawable->GetTargetRenderPassDescriptor();
RenderTarget render_target = drawable->GetRenderTarget();
auto texture = render_target.GetRenderTargetTexture();
auto& texture_vk = TextureVK::Cast(*texture);

2
engine/src/flutter/impeller/renderer/surface.cc
View File

@ -30,7 +30,7 @@ bool Surface::IsValid() const {
return is_valid_;
}
const RenderTarget& Surface::GetTargetRenderPassDescriptor() const {
const RenderTarget& Surface::GetRenderTarget() const {
return desc_;
}

2
engine/src/flutter/impeller/renderer/surface.h
View File

@ -21,7 +21,7 @@ class Surface {
bool IsValid() const;
const RenderTarget& GetTargetRenderPassDescriptor() const;
const RenderTarget& GetRenderTarget() const;
virtual bool Present() const;

2
engine/src/flutter/impeller/toolkit/interop/surface.cc
View File

@ -56,7 +56,7 @@ bool Surface::DrawDisplayList(const DisplayList& dl) const {
auto display_list = dl.GetDisplayList();
auto& content_context = context_->GetAiksContext().GetContentContext();
auto render_target = surface_->GetTargetRenderPassDescriptor();
auto render_target = surface_->GetRenderTarget();
const auto cull_rect = IRect::MakeSize(surface_->GetSize());
auto skia_cull_rect =

3
engine/src/flutter/shell/gpu/gpu_surface_gl_impeller.cc
View File

@ -98,8 +98,7 @@ std::unique_ptr<SurfaceFrame> GPUSurfaceGLImpeller::AcquireFrame(
impeller::ISize{size.width(), size.height()} // fbo_size
);
impeller::RenderTarget render_target =
surface->GetTargetRenderPassDescriptor();
impeller::RenderTarget render_target = surface->GetRenderTarget();
SurfaceFrame::EncodeCallback encode_calback =
[aiks_context = aiks_context_, //

26
engine/src/flutter/shell/gpu/gpu_surface_metal_impeller.mm
View File

@ -169,13 +169,12 @@ std::unique_ptr<SurfaceFrame> GPUSurfaceMetalImpeller::AcquireFrameFromCAMetalLa
surface->SetFrameBoundary(surface_frame.submit_info().frame_boundary);
const bool reset_host_buffer = surface_frame.submit_info().frame_boundary;
auto render_result =
impeller::RenderToOnscreen(aiks_context->GetContentContext(), //
surface->GetTargetRenderPassDescriptor(), //
display_list, //
sk_cull_rect, //
/*reset_host_buffer=*/reset_host_buffer //
);
auto render_result = impeller::RenderToOnscreen(aiks_context->GetContentContext(), //
surface->GetRenderTarget(), //
display_list, //
sk_cull_rect, //
/*reset_host_buffer=*/reset_host_buffer //
);
if (!render_result) {
return false;
}
@ -282,13 +281,12 @@ std::unique_ptr<SurfaceFrame> GPUSurfaceMetalImpeller::AcquireFrameFromMTLTextur
impeller::IRect cull_rect = surface->coverage();
SkIRect sk_cull_rect = SkIRect::MakeWH(cull_rect.GetWidth(), cull_rect.GetHeight());
auto render_result =
impeller::RenderToOnscreen(aiks_context->GetContentContext(), //
surface->GetTargetRenderPassDescriptor(), //
display_list, //
sk_cull_rect, //
/*reset_host_buffer=*/true //
);
auto render_result = impeller::RenderToOnscreen(aiks_context->GetContentContext(), //
surface->GetRenderTarget(), //
display_list, //
sk_cull_rect, //
/*reset_host_buffer=*/true //
);
if (!render_result) {
FML_LOG(ERROR) << "Failed to render Impeller frame";
return false;

6
engine/src/flutter/shell/gpu/gpu_surface_vulkan_impeller.cc
View File

@ -59,11 +59,9 @@ std::unique_ptr<SurfaceFrame> GPUSurfaceVulkanImpeller::AcquireFrame(
return nullptr;
}
auto cull_rect =
surface->GetTargetRenderPassDescriptor().GetRenderTargetSize();
auto cull_rect = surface->GetRenderTarget().GetRenderTargetSize();
impeller::RenderTarget render_target =
surface->GetTargetRenderPassDescriptor();
impeller::RenderTarget render_target = surface->GetRenderTarget();
SurfaceFrame::EncodeCallback encode_callback = [aiks_context =
aiks_context_, //