1 files changed, 17 insertions, 23 deletions
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index ffb649da3554..3b469af3a145 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -757,7 +757,7 @@ void VclProcessor2D::RenderPolyPolygonGraphicPrimitive2D(
     }
 }
 
-// mask group. Force output to VDev and create mask from given mask
+// mask group
 void VclProcessor2D::RenderMaskPrimitive2DPixel(const primitive2d::MaskPrimitive2D& rMaskCandidate)
 {
     if (rMaskCandidate.getChildren().empty())
@@ -769,6 +769,17 @@ void VclProcessor2D::RenderMaskPrimitive2DPixel(const primitive2d::MaskPrimitive
         return;
 
     aMask.transform(maCurrentTransformation);
+
+    // Unless smooth edges are needed, simply use clipping.
+    if (basegfx::utils::isRectangle(aMask) || !getOptionsDrawinglayer().IsAntiAliasing())
+    {
+        mpOutputDevice->Push(PushFlags::CLIPREGION);
+        mpOutputDevice->IntersectClipRegion(vcl::Region(aMask));
+        process(rMaskCandidate.getChildren());
+        mpOutputDevice->Pop();
+        return;
+    }
+
     const basegfx::B2DRange aRange(basegfx::utils::getRange(aMask));
     impBufferDevice aBufferDevice(*mpOutputDevice, aRange);
 
@@ -785,28 +796,11 @@ void VclProcessor2D::RenderMaskPrimitive2DPixel(const primitive2d::MaskPrimitive
     // back to old OutDev
     mpOutputDevice = pLastOutputDevice;
 
-    // if the mask fills the whole area we can skip
-    // creating a transparent vd and filling it.
-    if (!basegfx::utils::isRectangle(aMask))
-    {
-        // draw mask
-        if (getOptionsDrawinglayer().IsAntiAliasing())
-        {
-            // with AA, use 8bit AlphaMask to get nice borders
-            VirtualDevice& rTransparence = aBufferDevice.getTransparence();
-            rTransparence.SetLineColor();
-            rTransparence.SetFillColor(COL_BLACK);
-            rTransparence.DrawPolyPolygon(aMask);
-        }
-        else
-        {
-            // No AA, use 1bit mask
-            VirtualDevice& rMask = aBufferDevice.getMask();
-            rMask.SetLineColor();
-            rMask.SetFillColor(COL_BLACK);
-            rMask.DrawPolyPolygon(aMask);
-        }
-    }
+    // draw mask
+    VirtualDevice& rMask = aBufferDevice.getTransparence();
+    rMask.SetLineColor();
+    rMask.SetFillColor(COL_BLACK);
+    rMask.DrawPolyPolygon(aMask);
 
     // dump buffer to outdev
     aBufferDevice.paint();