mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-09 23:34:20 +00:00
Code Activity

Direct2D: Avoid unnecessarily transforming solid colour brush

Browse source 
The changes were not cleared between frames, so they could end up
accumulating and causing floating-point exceptions.
This commit is contained in:
reuk 2025-09-10 16:47:26 +01:00
parent 7981957f50
commit 81e4d59da2
No known key found for this signature in database
1 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

20
modules/juce_graphics/native/juce_Direct2DGraphicsContext_windows.cpp
View file

@ -1130,6 +1130,13 @@ void Direct2DGraphicsContext::drawGlyphs (Span<const uint16_t> glyphNumbers,
if (brush == nullptr) if (brush == nullptr)
return; return;
const auto getBrushTransform = [] (auto brushIn) -> AffineTransform
{
D2D1::Matrix3x2F matrix{};
brushIn->GetTransform (&matrix);
return D2DUtilities::matrixToTransform (matrix);
};
applyPendingClipList(); applyPendingClipList();
D2D1_POINT_2F baselineOrigin { 0.0f, 0.0f }; D2D1_POINT_2F baselineOrigin { 0.0f, 0.0f };
@ -1140,13 +1147,18 @@ void Direct2DGraphicsContext::drawGlyphs (Span<const uint16_t> glyphNumbers,
} }
else else
{ {
D2D1::Matrix3x2F matrix{}; if (brush != currentState->colourBrush)
brush->GetTransform (&matrix); {
const auto brushTransform = D2DUtilities::matrixToTransform (matrix); const auto brushTransform = getBrushTransform (brush);
brush->SetTransform (D2DUtilities::transformToMatrix (brushTransform.followedBy (textTransform.inverted()))); brush->SetTransform (D2DUtilities::transformToMatrix (brushTransform.followedBy (textTransform.inverted())));
}
getPimpl()->setDeviceContextTransform (textAndWorldTransform); getPimpl()->setDeviceContextTransform (textAndWorldTransform);
} }
// There's no need to transform a plain colour brush
jassert (brush != currentState->colourBrush || getBrushTransform (brush).isIdentity());
auto& run = getPimpl()->glyphRun; auto& run = getPimpl()->glyphRun;
run.replace (positions, fontScale); run.replace (positions, fontScale);