From d62fed45f784f663dff85a30f0937c169b56ea57 Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Wed, 9 Oct 2024 08:44:41 -0700 Subject: [PATCH] Rename `GetTargetRenderPassDescriptor` to `GetRenderTarget`. (flutter/engine#55765) Closes https://github.com/flutter/flutter/issues/154799. --- .../flutter/impeller/playground/playground.cc | 2 +- .../vulkan/test/swapchain_unittests.cc | 6 ++--- .../src/flutter/impeller/renderer/surface.cc | 2 +- .../src/flutter/impeller/renderer/surface.h | 2 +- .../impeller/toolkit/interop/surface.cc | 2 +- .../shell/gpu/gpu_surface_gl_impeller.cc | 3 +-- .../shell/gpu/gpu_surface_metal_impeller.mm | 26 +++++++++---------- .../shell/gpu/gpu_surface_vulkan_impeller.cc | 6 ++--- 8 files changed, 22 insertions(+), 27 deletions(-) diff --git a/engine/src/flutter/impeller/playground/playground.cc b/engine/src/flutter/impeller/playground/playground.cc index 0989d39b60..438244f429 100644 --- a/engine/src/flutter/impeller/playground/playground.cc +++ b/engine/src/flutter/impeller/playground/playground.cc @@ -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(), diff --git a/engine/src/flutter/impeller/renderer/backend/vulkan/test/swapchain_unittests.cc b/engine/src/flutter/impeller/renderer/backend/vulkan/test/swapchain_unittests.cc index ace4d05771..7589f849a1 100644 --- a/engine/src/flutter/impeller/renderer/backend/vulkan/test/swapchain_unittests.cc +++ b/engine/src/flutter/impeller/renderer/backend/vulkan/test/swapchain_unittests.cc @@ -72,7 +72,7 @@ TEST(SwapchainTest, CachesRenderPassOnSwapchainImage) { std::vector> 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> 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); diff --git a/engine/src/flutter/impeller/renderer/surface.cc b/engine/src/flutter/impeller/renderer/surface.cc index ce38697f47..108e0e07b5 100644 --- a/engine/src/flutter/impeller/renderer/surface.cc +++ b/engine/src/flutter/impeller/renderer/surface.cc @@ -30,7 +30,7 @@ bool Surface::IsValid() const { return is_valid_; } -const RenderTarget& Surface::GetTargetRenderPassDescriptor() const { +const RenderTarget& Surface::GetRenderTarget() const { return desc_; } diff --git a/engine/src/flutter/impeller/renderer/surface.h b/engine/src/flutter/impeller/renderer/surface.h index 42413f5d44..3a72a2481c 100644 --- a/engine/src/flutter/impeller/renderer/surface.h +++ b/engine/src/flutter/impeller/renderer/surface.h @@ -21,7 +21,7 @@ class Surface { bool IsValid() const; - const RenderTarget& GetTargetRenderPassDescriptor() const; + const RenderTarget& GetRenderTarget() const; virtual bool Present() const; diff --git a/engine/src/flutter/impeller/toolkit/interop/surface.cc b/engine/src/flutter/impeller/toolkit/interop/surface.cc index eca0b590a9..11e6def21e 100644 --- a/engine/src/flutter/impeller/toolkit/interop/surface.cc +++ b/engine/src/flutter/impeller/toolkit/interop/surface.cc @@ -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 = diff --git a/engine/src/flutter/shell/gpu/gpu_surface_gl_impeller.cc b/engine/src/flutter/shell/gpu/gpu_surface_gl_impeller.cc index 679bd3b2f9..138709e88d 100644 --- a/engine/src/flutter/shell/gpu/gpu_surface_gl_impeller.cc +++ b/engine/src/flutter/shell/gpu/gpu_surface_gl_impeller.cc @@ -98,8 +98,7 @@ std::unique_ptr 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_, // diff --git a/engine/src/flutter/shell/gpu/gpu_surface_metal_impeller.mm b/engine/src/flutter/shell/gpu/gpu_surface_metal_impeller.mm index ac97481195..5ec05628f4 100644 --- a/engine/src/flutter/shell/gpu/gpu_surface_metal_impeller.mm +++ b/engine/src/flutter/shell/gpu/gpu_surface_metal_impeller.mm @@ -169,13 +169,12 @@ std::unique_ptr 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 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; diff --git a/engine/src/flutter/shell/gpu/gpu_surface_vulkan_impeller.cc b/engine/src/flutter/shell/gpu/gpu_surface_vulkan_impeller.cc index 99e4d1dfee..aea1c9994d 100644 --- a/engine/src/flutter/shell/gpu/gpu_surface_vulkan_impeller.cc +++ b/engine/src/flutter/shell/gpu/gpu_surface_vulkan_impeller.cc @@ -59,11 +59,9 @@ std::unique_ptr 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_, //