Changeset 148953 in webkit

Timestamp:

Apr 23, 2013 2:02:03 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[Texmap] Don't paint to an intermediate surface when the result is going to be clipped out completely.
​https://bugs.webkit.org/show_bug.cgi?id=115015

Patch by Noam Rosenthal <Noam Rosenthal> on 2013-04-23
Reviewed by Allan Sandfeld Jensen.

Maintain a clipBounds rectangle in TextureMapper, and test it against the bounds of an intermediate
surface before it is painted.
This allows us to opt out completely of painting into the surface if the result is going to be optimized
out by the GPU clipping.

Covered by tests in compositing/overlap-blending.

• platform/graphics/texmap/TextureMapper.h:

(TextureMapper):

• platform/graphics/texmap/TextureMapperGL.cpp:

(WebCore::TextureMapperGL::clipBounds):
(WebCore):

• platform/graphics/texmap/TextureMapperGL.h:
• platform/graphics/texmap/TextureMapperImageBuffer.h:
• platform/graphics/texmap/TextureMapperLayer.cpp:

(WebCore::TextureMapperLayer::paintUsingOverlapRegions):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/texmap/TextureMapper.h (modified) (1 diff)
• platform/graphics/texmap/TextureMapperGL.cpp (modified) (1 diff)
• platform/graphics/texmap/TextureMapperGL.h (modified) (1 diff)
• platform/graphics/texmap/TextureMapperImageBuffer.h (modified) (1 diff)
• platform/graphics/texmap/TextureMapperLayer.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-23  Noam Rosenthal  <noam@webkit.org>
+
+        [Texmap] Don't paint to an intermediate surface when the result is going to be clipped out completely.
+        https://bugs.webkit.org/show_bug.cgi?id=115015
+
+        Reviewed by Allan Sandfeld Jensen.
+
+        Maintain a clipBounds rectangle in TextureMapper, and test it against the bounds of an intermediate
+        surface before it is painted.
+        This allows us to opt out completely of painting into the surface if the result is going to be optimized
+        out by the GPU clipping.
+
+        Covered by tests in compositing/overlap-blending.
+
+        * platform/graphics/texmap/TextureMapper.h:
+        (TextureMapper):
+        * platform/graphics/texmap/TextureMapperGL.cpp:
+        (WebCore::TextureMapperGL::clipBounds):
+        (WebCore):
+        * platform/graphics/texmap/TextureMapperGL.h:
+        * platform/graphics/texmap/TextureMapperImageBuffer.h:
+        * platform/graphics/texmap/TextureMapperLayer.cpp:
+        (WebCore::TextureMapperLayer::paintUsingOverlapRegions):
+
 2013-04-23  Noam Rosenthal  <noam@webkit.org>
 

trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.h

@@ -148 +148 @@
     virtual void beginClip(const TransformationMatrix&, const FloatRect&) = 0;
     virtual void endClip() = 0;
+    virtual IntRect clipBounds() = 0;
     virtual PassRefPtr<BitmapTexture> createTexture() = 0;
 

trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp

@@ -1199 +1199 @@
 }
 
+IntRect TextureMapperGL::clipBounds()
+{
+    return clipStack().current().scissorBox;
+}
+
 PassRefPtr<BitmapTexture> TextureMapperGL::createTexture()
 {

trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.h

@@ -65 +65 @@
     virtual void endPainting() OVERRIDE;
     virtual void endClip() OVERRIDE;
+    virtual IntRect clipBounds() OVERRIDE;
     virtual IntSize maxTextureSize() const OVERRIDE { return IntSize(2000, 2000); }
     virtual PassRefPtr<BitmapTexture> createTexture() OVERRIDE;

trunk/Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.h

@@ -61 +61 @@
     virtual void bindSurface(BitmapTexture* surface) OVERRIDE { m_currentSurface = surface;}
     virtual void endClip() OVERRIDE { graphicsContext()->restore(); }
+    virtual IntRect clipBounds() OVERRIDE { return currentContext()->clipBounds(); }
     virtual IntSize maxTextureSize() const;
     virtual PassRefPtr<BitmapTexture> createTexture() OVERRIDE { return BitmapTextureImageBuffer::create(); }

trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp

@@ -360 +360 @@
     }
 
-    Vector<IntRect> rects;
-
     nonOverlapRegion.translate(options.offset);
-    rects = nonOverlapRegion.rects();
+    Vector<IntRect> rects = nonOverlapRegion.rects();
     for (size_t i = 0; i < rects.size(); ++i) {
+        IntRect rect = rects[i];
+        if (!rect.intersects(options.textureMapper->clipBounds()))
+            continue;
+
         options.textureMapper->beginClip(TransformationMatrix(), rects[i]);
         paintSelfAndChildrenWithReplica(options);
@@ -372 +374 @@
     rects = overlapRegion.rects();
     IntSize maxTextureSize = options.textureMapper->maxTextureSize();
-    IntRect rect;
+    IntRect adjustedClipBounds(options.textureMapper->clipBounds());
+    adjustedClipBounds.move(-options.offset);
     for (size_t i = 0; i < rects.size(); ++i) {
-        rect = rects[i];
+        IntRect rect = rects[i];
         for (int x = rect.x(); x < rect.maxX(); x += maxTextureSize.width()) {
             for (int y = rect.y(); y < rect.maxY(); y += maxTextureSize.height()) {
                 IntRect tileRect(IntPoint(x, y), maxTextureSize);
                 tileRect.intersect(rect);
+                if (!tileRect.intersects(adjustedClipBounds))
+                    continue;
+
                 paintWithIntermediateSurface(options, tileRect);
             }