mirrors/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity.git synced 2025-01-22 09:21:57 -05:00
Code Issues Projects Releases Packages Wiki Activity

LibGfx: Only use draw_scaled_bitmap() fast path when not flipping image

Browse source 
If we're drawing a transform with a negative scale, we have to go
through the slow path since draw_scaled_bitmap() is unable to flip
images.

Fixes a regression from the 2nd commit in #24465.
This commit is contained in:
Nico Weber 2025-01-10 09:14:12 -05:00
parent 524f699ae2
commit bc469c3dd0
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Userland/Libraries/LibGfx/AffineTransform.h
View file

@ -35,8 +35,14 @@ public:
return m_values[0] == 1 && m_values[1] == 0 && m_values[2] == 0 && m_values[3] == 1; return m_values[0] == 1 && m_values[1] == 0 && m_values[2] == 0 && m_values[3] == 1;
} }
[[nodiscard]] bool is_identity_or_translation_or_scale() const enum class AllowNegativeScaling {
No,
Yes,
};
[[nodiscard]] bool is_identity_or_translation_or_scale(AllowNegativeScaling allow_negative_scaling) const
{ {
if (allow_negative_scaling == AllowNegativeScaling::No && (m_values[0] < 0 || m_values[3] < 0))
return false;
return m_values[1] == 0 && m_values[2] == 0; return m_values[1] == 0 && m_values[2] == 0;
} }

2
Userland/Libraries/LibGfx/Painter.cpp
View file

@ -2443,7 +2443,7 @@ void Painter::draw_text_run(FloatPoint baseline_start, Utf8View const& string, F
void Painter::draw_scaled_bitmap_with_transform(IntRect const& dst_rect, Bitmap const& bitmap, FloatRect const& src_rect, AffineTransform const& transform, float opacity, ScalingMode scaling_mode) void Painter::draw_scaled_bitmap_with_transform(IntRect const& dst_rect, Bitmap const& bitmap, FloatRect const& src_rect, AffineTransform const& transform, float opacity, ScalingMode scaling_mode)
{ {
if (transform.is_identity_or_translation_or_scale()) { if (transform.is_identity_or_translation_or_scale(Gfx::AffineTransform::AllowNegativeScaling::No)) {
draw_scaled_bitmap(transform.map(dst_rect.to_type<float>()).to_rounded<int>(), bitmap, src_rect, opacity, scaling_mode); draw_scaled_bitmap(transform.map(dst_rect.to_type<float>()).to_rounded<int>(), bitmap, src_rect, opacity, scaling_mode);
} else { } else {
// The painter has an affine transform, we have to draw through it! // The painter has an affine transform, we have to draw through it!

2
Userland/Libraries/LibWeb/Painting/AffineDisplayListPlayerCPU.cpp
View file

@ -138,7 +138,7 @@ CommandResult AffineDisplayListPlayerCPU::set_clip_rect(SetClipRect const& clip)
auto clip_quad = current_stacking_context.transform.map_to_quad(clip.rect.to_type<float>()); auto clip_quad = current_stacking_context.transform.map_to_quad(clip.rect.to_type<float>());
current_stacking_context.clip.bounds = enclosing_int_rect(clip_quad.bounding_rect()); current_stacking_context.clip.bounds = enclosing_int_rect(clip_quad.bounding_rect());
// FIXME: Flips and rotations by x*90° should also be marked as rectangular. // FIXME: Flips and rotations by x*90° should also be marked as rectangular.
current_stacking_context.clip.is_rectangular = current_stacking_context.transform.is_identity_or_translation_or_scale(); current_stacking_context.clip.is_rectangular = current_stacking_context.transform.is_identity_or_translation_or_scale(Gfx::AffineTransform::AllowNegativeScaling::Yes);
current_stacking_context.clip.quad = clip_quad; current_stacking_context.clip.quad = clip_quad;
painter().add_clip_rect(current_stacking_context.clip.bounds); painter().add_clip_rect(current_stacking_context.clip.bounds);
return CommandResult::Continue; return CommandResult::Continue;