Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
heck this works.
  • Loading branch information
jonahwilliams committed Feb 1, 2024
commit a292db791b6d401057c49b2608938faaf3de6a3e
2 changes: 1 addition & 1 deletion impeller/renderer/backend/vulkan/context_vk.cc
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ void ContextVK::Setup(Settings settings) {
// 1. The user has explicitly enabled it.
// 2. We are in a combination of debug mode, and running on Android.
// (It's possible 2 is overly conservative and we can simplify this)
auto enable_validation = settings.enable_validation;
auto enable_validation = false; //settings.enable_validation;

#if defined(FML_OS_ANDROID) && !defined(NDEBUG)
enable_validation = true;
Expand Down
20 changes: 0 additions & 20 deletions impeller/renderer/backend/vulkan/swapchain_image_vk.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,29 +44,9 @@ class SwapchainImageVK final : public TextureSourceVK {

bool IsSwapchainImage() const override { return true; }

void SetFramebuffer(
const SharedHandleVK<vk::Framebuffer>& framebuffer) const override {
framebuffer_ = framebuffer;
}

void SetRenderPass(
const SharedHandleVK<vk::RenderPass>& renderpass) const override {
renderpass_ = renderpass;
}

SharedHandleVK<vk::Framebuffer> GetFramebuffer() const override {
return framebuffer_;
}

SharedHandleVK<vk::RenderPass> GetRenderPass() const override {
return renderpass_;
}

private:
vk::Image image_ = VK_NULL_HANDLE;
vk::UniqueImageView image_view_ = {};
mutable SharedHandleVK<vk::Framebuffer> framebuffer_ = nullptr;
mutable SharedHandleVK<vk::RenderPass> renderpass_ = nullptr;
std::shared_ptr<Texture> msaa_tex_;
bool is_valid_ = false;

Expand Down
21 changes: 12 additions & 9 deletions impeller/renderer/backend/vulkan/texture_source_vk.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,20 +65,21 @@ class TextureSourceVK {
/// Whether or not this is a swapchain image.
virtual bool IsSwapchainImage() const = 0;

virtual void SetFramebuffer(
const SharedHandleVK<vk::Framebuffer>& framebuffer) const {}

virtual void SetRenderPass(
const SharedHandleVK<vk::RenderPass>& renderpass) const {}
void SetFramebuffer(
const SharedHandleVK<vk::Framebuffer>& framebuffer) const {
framebuffer_ = framebuffer;
}

virtual SharedHandleVK<vk::Framebuffer> GetFramebuffer() const {
return nullptr;
void SetRenderPass(const SharedHandleVK<vk::RenderPass>& renderpass) const {
renderpass_ = renderpass;
}

virtual SharedHandleVK<vk::RenderPass> GetRenderPass() const {
return nullptr;
SharedHandleVK<vk::Framebuffer> GetFramebuffer() const {
return framebuffer_;
}

SharedHandleVK<vk::RenderPass> GetRenderPass() const { return renderpass_; }

protected:
const TextureDescriptor desc_;

Expand All @@ -88,6 +89,8 @@ class TextureSourceVK {
mutable RWMutex layout_mutex_;
mutable vk::ImageLayout layout_ IPLR_GUARDED_BY(layout_mutex_) =
vk::ImageLayout::eUndefined;
mutable SharedHandleVK<vk::Framebuffer> framebuffer_ = nullptr;
mutable SharedHandleVK<vk::RenderPass> renderpass_ = nullptr;
};

} // namespace impeller
Expand Down