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

[Impeller] Remove depth/stencil attachments from imgui pipeline #38427

Merged
merged 1 commit into from
Dec 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
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
10 changes: 4 additions & 6 deletions impeller/playground/imgui/imgui_impl_impeller.cc
Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,10 @@ bool ImGui_ImplImpeller_Init(
auto desc = impeller::PipelineBuilder<impeller::ImguiRasterVertexShader,
impeller::ImguiRasterFragmentShader>::
MakeDefaultPipelineDescriptor(*context);
auto stencil = desc->GetFrontStencilAttachmentDescriptor();
if (stencil.has_value()) {
stencil->stencil_compare = impeller::CompareFunction::kAlways;
stencil->depth_stencil_pass = impeller::StencilOperation::kKeep;
desc->SetStencilAttachmentDescriptors(stencil.value());
}
desc->SetStencilPixelFormat(impeller::PixelFormat::kUnknown);
desc->SetStencilAttachmentDescriptors(std::nullopt);
desc->SetDepthPixelFormat(impeller::PixelFormat::kUnknown);
desc->SetDepthStencilAttachmentDescriptor(std::nullopt);

bd->pipeline =
context->GetPipelineLibrary()->GetPipeline(std::move(desc)).Get();
Expand Down
8 changes: 4 additions & 4 deletions impeller/renderer/pipeline_descriptor.cc
Original file line number Diff line number Diff line change
Expand Up @@ -135,19 +135,19 @@ PipelineDescriptor& PipelineDescriptor::SetStencilPixelFormat(
}

PipelineDescriptor& PipelineDescriptor::SetDepthStencilAttachmentDescriptor(
DepthAttachmentDescriptor desc) {
std::optional<DepthAttachmentDescriptor> desc) {
depth_attachment_descriptor_ = desc;
return *this;
}

PipelineDescriptor& PipelineDescriptor::SetStencilAttachmentDescriptors(
StencilAttachmentDescriptor front_and_back) {
std::optional<StencilAttachmentDescriptor> front_and_back) {
return SetStencilAttachmentDescriptors(front_and_back, front_and_back);
}

PipelineDescriptor& PipelineDescriptor::SetStencilAttachmentDescriptors(
StencilAttachmentDescriptor front,
StencilAttachmentDescriptor back) {
std::optional<StencilAttachmentDescriptor> front,
std::optional<StencilAttachmentDescriptor> back) {
front_stencil_attachment_descriptor_ = front;
back_stencil_attachment_descriptor_ = back;
return *this;
Expand Down
8 changes: 4 additions & 4 deletions impeller/renderer/pipeline_descriptor.h
Original file line number Diff line number Diff line change
Expand Up @@ -71,17 +71,17 @@ class PipelineDescriptor final : public Comparable<PipelineDescriptor> {
const ColorAttachmentDescriptor* GetLegacyCompatibleColorAttachment() const;

PipelineDescriptor& SetDepthStencilAttachmentDescriptor(
DepthAttachmentDescriptor desc);
std::optional<DepthAttachmentDescriptor> desc);

std::optional<DepthAttachmentDescriptor> GetDepthStencilAttachmentDescriptor()
const;

PipelineDescriptor& SetStencilAttachmentDescriptors(
StencilAttachmentDescriptor front_and_back);
std::optional<StencilAttachmentDescriptor> front_and_back);

PipelineDescriptor& SetStencilAttachmentDescriptors(
StencilAttachmentDescriptor front,
StencilAttachmentDescriptor back);
std::optional<StencilAttachmentDescriptor> front,
std::optional<StencilAttachmentDescriptor> back);

std::optional<StencilAttachmentDescriptor>
GetFrontStencilAttachmentDescriptor() const;
Expand Down