Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

[Impeller] Refactor KHR swapchains to make it easy to reuse backend agnostic components. #52002

Merged
auto-submit merged 4 commits into from
Apr 9, 2024
Merged

[Impeller] Refactor KHR swapchains to make it easy to reuse backend agnostic components. #52002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
db715c7
[Impeller] Refactor KHR swapchains to make it easy to reuse backend a…
chinmaygarde Apr 8, 2024
4b84b8f
PR review.
chinmaygarde Apr 9, 2024
cc74be6
Licenses.
chinmaygarde Apr 9, 2024
6f56a73
Formats.
chinmaygarde Apr 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions ci/licenses_golden/licenses_flutter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40292,14 +40292,18 @@ ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/shared_object_vk.cc +
ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/shared_object_vk.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/surface_context_vk.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/surface_context_vk.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/swapchain/khr/khr_surface_vk.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/swapchain/khr/khr_surface_vk.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_image_vk.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_image_vk.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_impl_vk.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_impl_vk.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_vk.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_vk.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/swapchain/surface_vk.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/swapchain/surface_vk.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/swapchain/swapchain_transients_vk.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/swapchain/swapchain_transients_vk.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/swapchain/swapchain_vk.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/swapchain/swapchain_vk.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/texture_source_vk.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/texture_source_vk.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/texture_vk.cc + ../../../flutter/LICENSE
Expand Down Expand Up @@ -43169,14 +43173,18 @@ FILE: ../../../flutter/impeller/renderer/backend/vulkan/shared_object_vk.cc
FILE: ../../../flutter/impeller/renderer/backend/vulkan/shared_object_vk.h
FILE: ../../../flutter/impeller/renderer/backend/vulkan/surface_context_vk.cc
FILE: ../../../flutter/impeller/renderer/backend/vulkan/surface_context_vk.h
FILE: ../../../flutter/impeller/renderer/backend/vulkan/swapchain/khr/khr_surface_vk.cc
FILE: ../../../flutter/impeller/renderer/backend/vulkan/swapchain/khr/khr_surface_vk.h
FILE: ../../../flutter/impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_image_vk.cc
FILE: ../../../flutter/impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_image_vk.h
FILE: ../../../flutter/impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_impl_vk.cc
FILE: ../../../flutter/impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_impl_vk.h
FILE: ../../../flutter/impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_vk.cc
FILE: ../../../flutter/impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_vk.h
FILE: ../../../flutter/impeller/renderer/backend/vulkan/swapchain/surface_vk.cc
FILE: ../../../flutter/impeller/renderer/backend/vulkan/swapchain/surface_vk.h
FILE: ../../../flutter/impeller/renderer/backend/vulkan/swapchain/swapchain_transients_vk.cc
FILE: ../../../flutter/impeller/renderer/backend/vulkan/swapchain/swapchain_transients_vk.h
FILE: ../../../flutter/impeller/renderer/backend/vulkan/swapchain/swapchain_vk.cc
FILE: ../../../flutter/impeller/renderer/backend/vulkan/swapchain/swapchain_vk.h
FILE: ../../../flutter/impeller/renderer/backend/vulkan/texture_source_vk.cc
FILE: ../../../flutter/impeller/renderer/backend/vulkan/texture_source_vk.h
FILE: ../../../flutter/impeller/renderer/backend/vulkan/texture_vk.cc
Expand Down
2 changes: 1 addition & 1 deletion impeller/playground/backend/vulkan/playground_impl_vk.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include "impeller/renderer/backend/vulkan/context_vk.h"
#include "impeller/renderer/backend/vulkan/formats_vk.h"
#include "impeller/renderer/backend/vulkan/surface_context_vk.h"
#include "impeller/renderer/backend/vulkan/swapchain/khr/khr_surface_vk.h"
#include "impeller/renderer/backend/vulkan/swapchain/surface_vk.h"
#include "impeller/renderer/backend/vulkan/texture_vk.h"
#include "impeller/renderer/vk/compute_shaders_vk.h"
#include "impeller/scene/shaders/vk/scene_shaders_vk.h"
Expand Down
8 changes: 6 additions & 2 deletions impeller/renderer/backend/vulkan/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,14 +100,18 @@ impeller_component("vulkan") {
"shared_object_vk.h",
"surface_context_vk.cc",
"surface_context_vk.h",
"swapchain/khr/khr_surface_vk.cc",
"swapchain/khr/khr_surface_vk.h",
"swapchain/khr/khr_swapchain_image_vk.cc",
"swapchain/khr/khr_swapchain_image_vk.h",
"swapchain/khr/khr_swapchain_impl_vk.cc",
"swapchain/khr/khr_swapchain_impl_vk.h",
"swapchain/khr/khr_swapchain_vk.cc",
"swapchain/khr/khr_swapchain_vk.h",
"swapchain/surface_vk.cc",
"swapchain/surface_vk.h",
"swapchain/swapchain_transients_vk.cc",
"swapchain/swapchain_transients_vk.h",
"swapchain/swapchain_vk.cc",
"swapchain/swapchain_vk.h",
"texture_source_vk.cc",
"texture_source_vk.h",
"texture_vk.cc",
Expand Down
2 changes: 1 addition & 1 deletion impeller/renderer/backend/vulkan/surface_context_vk.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ void SurfaceContextVK::Shutdown() {

bool SurfaceContextVK::SetWindowSurface(vk::UniqueSurfaceKHR surface,
const ISize& size) {
auto swapchain = KHRSwapchainVK::Create(parent_, std::move(surface), size);
auto swapchain = SwapchainVK::Create(parent_, std::move(surface), size);
if (!swapchain) {
VALIDATION_LOG << "Could not create swapchain.";
return false;
Expand Down
4 changes: 2 additions & 2 deletions impeller/renderer/backend/vulkan/surface_context_vk.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace impeller {

class ContextVK;
class Surface;
class KHRSwapchainVK;
class SwapchainVK;

/// For Vulkan, there is both a ContextVK that implements Context and a
/// SurfaceContextVK that also implements Context and takes a ContextVK as its
Expand Down Expand Up @@ -90,7 +90,7 @@ class SurfaceContextVK : public Context,

private:
std::shared_ptr<ContextVK> parent_;
std::shared_ptr<KHRSwapchainVK> swapchain_;
std::shared_ptr<SwapchainVK> swapchain_;
};

} // namespace impeller
Expand Down
104 changes: 0 additions & 104 deletions impeller/renderer/backend/vulkan/swapchain/khr/khr_surface_vk.cc
View file
Open in desktop

This file was deleted.

49 changes: 0 additions & 49 deletions impeller/renderer/backend/vulkan/swapchain/khr/khr_surface_vk.h
View file
Open in desktop

This file was deleted.

30 changes: 5 additions & 25 deletions impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_image_vk.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,31 +35,6 @@ bool KHRSwapchainImageVK::IsValid() const {
return is_valid_;
}

std::shared_ptr<Texture> KHRSwapchainImageVK::GetMSAATexture() const {
return msaa_texture_;
}

std::shared_ptr<Texture> KHRSwapchainImageVK::GetDepthStencilTexture() const {
return depth_stencil_texture_;
}

void KHRSwapchainImageVK::SetMSAATexture(std::shared_ptr<Texture> texture) {
msaa_texture_ = std::move(texture);
}

void KHRSwapchainImageVK::SetDepthStencilTexture(
std::shared_ptr<Texture> texture) {
depth_stencil_texture_ = std::move(texture);
}

PixelFormat KHRSwapchainImageVK::GetPixelFormat() const {
return desc_.format;
}

ISize KHRSwapchainImageVK::GetSize() const {
return desc_.size;
}

// |TextureSourceVK|
vk::Image KHRSwapchainImageVK::GetImage() const {
return image_;
Expand All @@ -75,4 +50,9 @@ vk::ImageView KHRSwapchainImageVK::GetRenderTargetView() const {
return image_view_.get();
}

// |TextureSourceVK|
bool KHRSwapchainImageVK::IsSwapchainImage() const {
return true;
}

} // namespace impeller
19 changes: 3 additions & 16 deletions impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_image_vk.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
#include "impeller/renderer/backend/vulkan/formats_vk.h"
#include "impeller/renderer/backend/vulkan/texture_source_vk.h"
#include "impeller/renderer/backend/vulkan/vk.h"
#include "vulkan/vulkan_handles.hpp"

namespace impeller {

Expand All @@ -24,33 +23,21 @@ class KHRSwapchainImageVK final : public TextureSourceVK {

bool IsValid() const;

PixelFormat GetPixelFormat() const;

ISize GetSize() const;

// |TextureSourceVK|
vk::Image GetImage() const override;

std::shared_ptr<Texture> GetMSAATexture() const;

std::shared_ptr<Texture> GetDepthStencilTexture() const;

// |TextureSourceVK|
vk::ImageView GetImageView() const override;

// |TextureSourceVK|
vk::ImageView GetRenderTargetView() const override;

void SetMSAATexture(std::shared_ptr<Texture> texture);

void SetDepthStencilTexture(std::shared_ptr<Texture> texture);

bool IsSwapchainImage() const override { return true; }
// |TextureSourceVK|
bool IsSwapchainImage() const override;

private:
vk::Image image_ = VK_NULL_HANDLE;
vk::UniqueImageView image_view_ = {};
std::shared_ptr<Texture> msaa_texture_;
std::shared_ptr<Texture> depth_stencil_texture_;
bool is_valid_ = false;

KHRSwapchainImageVK(const KHRSwapchainImageVK&) = delete;
Expand Down
Loading