DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename render pass attachment structs.

Browse Source
This commit is contained in:
Chinmay Garde 2021-07-18 14:38:30 -07:00 committed by Dan Field
parent cd71fe879f
commit feb43bfae7
6 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engine/src/flutter/impeller/compositor/formats.h
View File

@ -290,15 +290,15 @@ struct RenderPassAttachment {
constexpr operator bool() const { return static_cast<bool>(texture); }
};
struct ColorRenderPassAttachment : public RenderPassAttachment {
struct RenderPassColorAttachment : public RenderPassAttachment {
Color clear_color = Color::BlackTransparent();
};
struct DepthRenderPassAttachment : public RenderPassAttachment {
struct RenderPassDepthAttachment : public RenderPassAttachment {
double clear_depth = 0.0;
};
struct StencilRenderPassAttachment : public RenderPassAttachment {
struct RenderPassStencilAttachment : public RenderPassAttachment {
uint32_t clear_stencil = 0;
};

6
engine/src/flutter/impeller/compositor/render_pass.mm
View File

@ -30,7 +30,7 @@ static bool ConfigureAttachment(const RenderPassAttachment& desc,
}
static bool ConfigureColorAttachment(
const ColorRenderPassAttachment& desc,
const RenderPassColorAttachment& desc,
MTLRenderPassColorAttachmentDescriptor* attachment) {
if (!ConfigureAttachment(desc, attachment)) {
return false;
@ -40,7 +40,7 @@ static bool ConfigureColorAttachment(
}
static bool ConfigureDepthAttachment(
const DepthRenderPassAttachment& desc,
const RenderPassDepthAttachment& desc,
MTLRenderPassDepthAttachmentDescriptor* attachment) {
if (!ConfigureAttachment(desc, attachment)) {
return false;
@ -50,7 +50,7 @@ static bool ConfigureDepthAttachment(
}
static bool ConfigureStencilAttachment(
const StencilRenderPassAttachment& desc,
const RenderPassStencilAttachment& desc,
MTLRenderPassStencilAttachmentDescriptor* attachment) {
if (!ConfigureAttachment(desc, attachment)) {
return false;

12
engine/src/flutter/impeller/compositor/render_pass_descriptor.h
View File

@ -25,21 +25,21 @@ class RenderPassDescriptor {
std::optional<ISize> GetColorAttachmentSize(size_t index) const;
RenderPassDescriptor& SetColorAttachment(ColorRenderPassAttachment attachment,
RenderPassDescriptor& SetColorAttachment(RenderPassColorAttachment attachment,
size_t index);
RenderPassDescriptor& SetDepthAttachment(
DepthRenderPassAttachment attachment);
RenderPassDepthAttachment attachment);
RenderPassDescriptor& SetStencilAttachment(
StencilRenderPassAttachment attachment);
RenderPassStencilAttachment attachment);
MTLRenderPassDescriptor* ToMTLRenderPassDescriptor() const;
private:
std::map<size_t, ColorRenderPassAttachment> colors_;
std::optional<DepthRenderPassAttachment> depth_;
std::optional<StencilRenderPassAttachment> stencil_;
std::map<size_t, RenderPassColorAttachment> colors_;
std::optional<RenderPassDepthAttachment> depth_;
std::optional<RenderPassStencilAttachment> stencil_;
};
} // namespace impeller

6
engine/src/flutter/impeller/compositor/render_pass_descriptor.mm
View File

@ -31,7 +31,7 @@ std::optional<ISize> RenderPassDescriptor::GetColorAttachmentSize(
}
RenderPassDescriptor& RenderPassDescriptor::SetColorAttachment(
ColorRenderPassAttachment attachment,
RenderPassColorAttachment attachment,
size_t index) {
if (attachment) {
colors_[index] = attachment;
@ -40,7 +40,7 @@ RenderPassDescriptor& RenderPassDescriptor::SetColorAttachment(
}
RenderPassDescriptor& RenderPassDescriptor::SetDepthAttachment(
DepthRenderPassAttachment attachment) {
RenderPassDepthAttachment attachment) {
if (attachment) {
depth_ = std::move(attachment);
}
@ -48,7 +48,7 @@ RenderPassDescriptor& RenderPassDescriptor::SetDepthAttachment(
}
RenderPassDescriptor& RenderPassDescriptor::SetStencilAttachment(
StencilRenderPassAttachment attachment) {
RenderPassStencilAttachment attachment) {
if (attachment) {
stencil_ = std::move(attachment);
}

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

@ -136,7 +136,7 @@ bool Playground::OpenPlaygroundHere(Renderer::RenderCallback render_callback) {
static_cast<ISize::Type>(current_drawable.texture.width),
static_cast<ISize::Type>(current_drawable.texture.height)};
ColorRenderPassAttachment color0;
RenderPassColorAttachment color0;
color0.texture =
std::make_shared<Texture>(color0_desc, current_drawable.texture);
color0.clear_color = Color::SkyBlue();

2
engine/src/flutter/impeller/primitives/primitives_unittests.mm
View File

@ -193,7 +193,7 @@ TEST_F(PrimitivesTest, CanRenderToTexture) {
std::shared_ptr<RenderPass> r2t_pass;
{
ColorRenderPassAttachment color0;
RenderPassColorAttachment color0;
color0.load_action = LoadAction::kClear;
color0.store_action = StoreAction::kStore;