RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 10:17:35 +00:00
Code Issues Activity Actions

LibGfx: Make Filter::Parameters more light-weight

Browse source 
By moving the Bitmap and Rect out of Filter::Parameters we can re-use
the parameters more efficiently, allowing the filter to be applied
to many bitmaps without having to re-create the filter every time.
This commit is contained in:
Tom 2020-10-02 19:57:48 -06:00 • committed by Andreas Kling
parent 6188c6e8a3
commit da8d87c297
4 changed files with 35 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Libraries/LibGfx/Filters/Filter.h
View file

@ -35,28 +35,15 @@ class Filter {
public:
class Parameters {
public:
Parameters(Bitmap& bitmap, const IntRect& rect)
: m_target_bitmap(bitmap)
, m_target_rect(rect)
{
}
Bitmap& bitmap() const { return m_target_bitmap; }
const IntRect& rect() const { return m_target_rect; }
virtual bool is_generic_convolution_filter() const { return false; }
virtual ~Parameters() { }
private:
Bitmap& m_target_bitmap;
IntRect m_target_rect;
};
virtual ~Filter() { }
virtual const char* class_name() const = 0;
virtual void apply(const Parameters&) = 0;
virtual void apply(Bitmap&, const IntRect&, const Parameters&) = 0;
protected:
Filter() { }

17
Libraries/LibGfx/Filters/GenericConvolutionFilter.h
View file

@ -53,9 +53,8 @@ class GenericConvolutionFilter : public Filter {
public:
class Parameters : public Filter::Parameters {
public:
Parameters(Gfx::Bitmap& bitmap, const Gfx::IntRect& rect, Gfx::Matrix<N, float> kernel, bool should_wrap = false)
: Filter::Parameters(bitmap, rect)
, m_kernel(move(kernel))
Parameters(const Gfx::Matrix<N, float>& kernel, bool should_wrap = false)
: m_kernel(kernel)
, m_should_wrap(should_wrap)
{
@ -83,21 +82,19 @@ public:
virtual const char* class_name() const override { return "GenericConvolutionFilter"; }
virtual void apply(const Filter::Parameters& parameters) override
virtual void apply(Bitmap& bitmap, const IntRect& rect, const Filter::Parameters& parameters) override
{
ASSERT(parameters.is_generic_convolution_filter());
auto& gcf_params = static_cast<const GenericConvolutionFilter::Parameters&>(parameters);
ApplyCache apply_cache;
apply(gcf_params, apply_cache);
apply(bitmap, rect, gcf_params, apply_cache);
}
void apply(const GenericConvolutionFilter::Parameters& parameters, ApplyCache& apply_cache)
void apply(Bitmap& source, const IntRect& source_rect, const GenericConvolutionFilter::Parameters& parameters, ApplyCache& apply_cache)
{
auto& source = parameters.bitmap();
const auto& source_rect = parameters.rect();
if (!apply_cache.m_target || apply_cache.m_target->size().contains(parameters.rect().size()))
apply_cache.m_target = Gfx::Bitmap::create(source.format(), parameters.rect().size());
if (!apply_cache.m_target || !apply_cache.m_target->size().contains(source_rect.size()))
apply_cache.m_target = Gfx::Bitmap::create(source.format(), source_rect.size());
// FIXME: Help! I am naive!
for (auto i_ = 0; i_ < source_rect.width(); ++i_) {