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
++
  • Loading branch information
jonahwilliams committed Nov 17, 2022
commit 6464e6305d53d12df772c4630752b287555e252a
2 changes: 1 addition & 1 deletion impeller/entity/contents/linear_gradient_contents.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class LinearGradientContents final : public ColorSourceContents {
const ContentContext& renderer,
const Entity& entity,
RenderPass& pass) const;
#endif // FML_OS_ANDROID
#endif // FML_OS_ANDROID

Point start_point_;
Point end_point_;
Expand Down
4 changes: 2 additions & 2 deletions impeller/entity/contents/radial_gradient_contents.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
#include "impeller/entity/contents/color_source_contents.h"
#include "impeller/entity/entity.h"
#include "impeller/geometry/color.h"
#include "impeller/geometry/gradient.h"
#include "impeller/geometry/path.h"
#include "impeller/geometry/point.h"
#include "impeller/geometry/gradient.h"

namespace impeller {

Expand Down Expand Up @@ -52,7 +52,7 @@ class RadialGradientContents final : public ColorSourceContents {
const ContentContext& renderer,
const Entity& entity,
RenderPass& pass) const;
#endif // FML_OS_ANDROID
#endif // FML_OS_ANDROID

Point center_;
Scalar radius_;
Expand Down
12 changes: 6 additions & 6 deletions impeller/entity/contents/sweep_gradient_contents.cc
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ const std::vector<Scalar>& SweepGradientContents::GetStops() const {
}

bool SweepGradientContents::Render(const ContentContext& renderer,
const Entity& entity,
RenderPass& pass) const {
const Entity& entity,
RenderPass& pass) const {
#ifdef FML_OS_ANDROID
auto gradient_data = CreateGradientBuffer(colors_, stops_);
return RenderTexture(gradient_data, renderer, entity, pass);
Expand All @@ -67,9 +67,9 @@ bool SweepGradientContents::Render(const ContentContext& renderer,

#ifndef FML_OS_ANDROID
bool SweepGradientContents::RenderFixed(const GradientData& gradient_data,
const ContentContext& renderer,
const Entity& entity,
RenderPass& pass) const {
const ContentContext& renderer,
const Entity& entity,
RenderPass& pass) const {
using VS = SweepGradientFixedFillPipeline::VertexShader;
using FS = SweepGradientFixedFillPipeline::FragmentShader;

Expand Down Expand Up @@ -117,7 +117,7 @@ bool SweepGradientContents::RenderFixed(const GradientData& gradient_data,
}
return true;
}
#endif // FML_OS_ANDROID
#endif // FML_OS_ANDROID

bool SweepGradientContents::RenderTexture(const GradientData& gradient_data,
const ContentContext& renderer,
Expand Down
4 changes: 2 additions & 2 deletions impeller/entity/contents/sweep_gradient_contents.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
#include "impeller/entity/contents/color_source_contents.h"
#include "impeller/entity/entity.h"
#include "impeller/geometry/color.h"
#include "impeller/geometry/gradient.h"
#include "impeller/geometry/path.h"
#include "impeller/geometry/point.h"
#include "impeller/geometry/scalar.h"
#include "impeller/geometry/gradient.h"

namespace impeller {

Expand Down Expand Up @@ -53,7 +53,7 @@ class SweepGradientContents final : public ColorSourceContents {
const ContentContext& renderer,
const Entity& entity,
RenderPass& pass) const;
#endif // FML_OS_ANDROID
#endif // FML_OS_ANDROID

Point center_;
Scalar bias_;
Expand Down
2 changes: 1 addition & 1 deletion impeller/geometry/gradient.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ namespace impeller {
constexpr uint32_t FIXED_GRADIENT_SIZE = 0;
#else
constexpr uint32_t FIXED_GRADIENT_SIZE = 16;
#endif // FML_OS_ANDROID
#endif // FML_OS_ANDROID

// If texture_size is 0 then the gradient is invalid.
struct GradientData {
Expand Down