Changeset 192689 in webkit

Timestamp:

Nov 20, 2015 12:05:05 PM (8 years ago)

Author:

Simon Fraser

Message:

Back-buffer to front-buffer copy fails for some buffer formats
​https://bugs.webkit.org/show_bug.cgi?id=151475
rdar://problem/23617899

Reviewed by Tim Horton.

Source/WebCore:

Fix some fo the bitsPerComponent/bitsPerPixel options in IOSurface::ensurePlatformContext()
for RGB10 buffers. Fix IOSurface::format() to return the new formats.

Implement IOSurface::copyToSurface(), which does a synchronous copy between
surfaces.

• platform/graphics/cocoa/IOSurface.h:
• platform/graphics/cocoa/IOSurface.mm:

(IOSurface::create):
(IOSurface::ensurePlatformContext):
(IOSurface::format):
(IOSurface::copyToSurface):

Source/WebKit2:

When displaying RemoteLayerBackingStore, we copy the back buffer to the front
buffer before painting the updated regions. For buffers using Format::RGB10A8,
the CGImage-based copy fails, so in this case, use IOSurface::copyToSurface().

Reorganized RemoteLayerBackingStore::drawInContext() to make this a bit easier
to understand. First, we either copy the entire surface over, or paint the backImage.
Then we clip to the dirty rects, and clear them, then paint the layer contents.

• Shared/mac/RemoteLayerBackingStore.mm:

(WebKit::RemoteLayerBackingStore::display):
(WebKit::RemoteLayerBackingStore::drawInContext):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/cocoa/IOSurface.h (modified) (2 diffs)
• WebCore/platform/graphics/cocoa/IOSurface.mm (modified) (4 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/Shared/mac/RemoteLayerBackingStore.mm (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-11-19  Simon Fraser  <simon.fraser@apple.com>
+
+        Back-buffer to front-buffer copy fails for some buffer formats
+        https://bugs.webkit.org/show_bug.cgi?id=151475
+        rdar://problem/23617899
+
+        Reviewed by Tim Horton.
+        
+        Fix some fo the bitsPerComponent/bitsPerPixel options in IOSurface::ensurePlatformContext()
+        for RGB10 buffers. Fix IOSurface::format() to return the new formats.
+        
+        Implement IOSurface::copyToSurface(), which does a synchronous copy between
+        surfaces.
+
+        * platform/graphics/cocoa/IOSurface.h:
+        * platform/graphics/cocoa/IOSurface.mm:
+        (IOSurface::create):
+        (IOSurface::ensurePlatformContext):
+        (IOSurface::format):
+        (IOSurface::copyToSurface):
+
 2015-11-20  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.h

@@ -81 +81 @@
     size_t totalBytes() const { return m_totalBytes; }
     ColorSpace colorSpace() const { return m_colorSpace; }
-    Format format() const;
+    WEBCORE_EXPORT Format format() const;
 
     WEBCORE_EXPORT bool isInUse() const;
@@ -90 +90 @@
 
 #if PLATFORM(IOS)
+    WEBCORE_EXPORT void copyToSurface(IOSurface&);
     WEBCORE_EXPORT static void convertToFormat(std::unique_ptr<WebCore::IOSurface>&& inSurface, Format, std::function<void(std::unique_ptr<WebCore::IOSurface>)>);
 #endif

trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm

@@ -55 +55 @@
 {
     // YUV422 IOSurfaces do not go in the pool.
+    // FIXME: Want pooling of RGB10, RGB10A8.
     if (pixelFormat == Format::RGBA) {
         if (auto cachedSurface = surfaceFromPool(size, size, colorSpace))
@@ -260 +261 @@
 
     CGBitmapInfo bitmapInfo = kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host;
+
     size_t bitsPerComponent = 8;
     size_t bitsPerPixel = 32;
+    
+    switch (format()) {
+    case Format::RGBA:
+        break;
+    case Format::RGB10:
+        bitsPerComponent = 10;
+        bitsPerPixel = 32;
+        break;
+    case Format::RGB10A8:
+        // FIXME: This doesn't take the two-plane format into account.
+        bitsPerComponent = 10;
+        bitsPerPixel = 32;
+        break;
+    case Format::YUV422:
+        ASSERT_NOT_REACHED();
+        break;
+    }
+    
     m_cgContext = adoptCF(CGIOSurfaceContextCreate(m_surface.get(), m_contextSize.width(), m_contextSize.height(), bitsPerComponent, bitsPerPixel, cachedCGColorSpace(m_colorSpace), bitmapInfo));
 
@@ -311 +331 @@
     if (pixelFormat == 'BGRA')
         return Format::RGBA;
+
+    if (pixelFormat == 'w30r')
+        return Format::RGB10;
+
+    if (pixelFormat == 'b3a8')
+        return Format::RGB10A8;
+
     if (pixelFormat == 'yuvf')
         return Format::YUV422;
@@ -330 +357 @@
 
 #if PLATFORM(IOS)
+WEBCORE_EXPORT void IOSurface::copyToSurface(IOSurface& destSurface)
+{
+    if (destSurface.format() != format()) {
+        WTFLogAlways("Trying to copy IOSurface to another surface with a different format");
+        return;
+    }
+
+    if (destSurface.size() != size()) {
+        WTFLogAlways("Trying to copy IOSurface to another surface with a different size");
+        return;
+    }
+
+    static IOSurfaceAcceleratorRef accelerator;
+    if (!accelerator)
+        IOSurfaceAcceleratorCreate(nullptr, nullptr, &accelerator);
+
+    IOReturn ret = IOSurfaceAcceleratorTransformSurface(accelerator, m_surface.get(), destSurface.surface(), nullptr, nullptr, nullptr, nullptr, nullptr);
+    if (ret)
+        WTFLogAlways("IOSurfaceAcceleratorTransformSurface %p to %p failed with error %d", m_surface.get(), destSurface.surface(), ret);
+}
+
 void IOSurface::convertToFormat(std::unique_ptr<WebCore::IOSurface>&& inSurface, Format format, std::function<void(std::unique_ptr<WebCore::IOSurface>)> callback)
 {

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-11-19  Simon Fraser  <simon.fraser@apple.com>
+
+        Back-buffer to front-buffer copy fails for some buffer formats
+        https://bugs.webkit.org/show_bug.cgi?id=151475
+        rdar://problem/23617899
+
+        Reviewed by Tim Horton.
+        
+        When displaying RemoteLayerBackingStore, we copy the back buffer to the front
+        buffer before painting the updated regions. For buffers using Format::RGB10A8,
+        the CGImage-based copy fails, so in this case, use IOSurface::copyToSurface().
+        
+        Reorganized RemoteLayerBackingStore::drawInContext() to make this a bit easier
+        to understand. First, we either copy the entire surface over, or paint the backImage.
+        Then we clip to the dirty rects, and clear them, then paint the layer contents.
+
+        * Shared/mac/RemoteLayerBackingStore.mm:
+        (WebKit::RemoteLayerBackingStore::display):
+        (WebKit::RemoteLayerBackingStore::drawInContext):
+
 2015-11-19  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm

@@ -253 +253 @@
     if (m_acceleratesDrawing) {
         RetainPtr<CGImageRef> backImage;
-        if (m_backBuffer.surface && !willPaintEntireBackingStore)
-            backImage = m_backBuffer.surface->createImage();
+        if (m_backBuffer.surface && !willPaintEntireBackingStore) {
+#if PLATFORM(IOS)
+            if (m_backBuffer.surface->format() == WebCore::IOSurface::Format::RGB10A8) {
+                // FIXME: remove this when rdar://problem/23623670 is fixed.
+                m_backBuffer.surface->copyToSurface(*m_frontBuffer.surface);
+            } else
+#endif
+                backImage = m_backBuffer.surface->createImage();
+        }
 
         GraphicsContext& context = m_frontBuffer.surface->ensureGraphicsContext();
@@ -286 +293 @@
     scaledSize.scale(m_scale);
     IntRect scaledLayerBounds(IntPoint(), roundedIntSize(scaledSize));
-
-    if (!m_isOpaque)
-        context.clearRect(scaledLayerBounds);
-
-#ifndef NDEBUG
-    if (m_isOpaque)
-        context.fillRect(scaledLayerBounds, Color(255, 0, 0));
-#endif
-
-    CGContextRef cgContext = context.platformContext();
 
     // If we have less than webLayerMaxRectsToPaint rects to paint and they cover less
@@ -324 +321 @@
     }
 
+    CGContextRef cgContext = context.platformContext();
+
     if (backImage) {
-        CGContextSaveGState(cgContext);
+        CGContextStateSaver stateSaver(cgContext);
         CGContextSetBlendMode(cgContext, kCGBlendModeCopy);
-
-        CGContextAddRect(cgContext, CGRectInfinite);
-        CGContextAddRects(cgContext, cgPaintingRects, m_paintingRects.size());
-        CGContextEOClip(cgContext);
-
         CGContextTranslateCTM(cgContext, 0, scaledLayerBounds.height());
         CGContextScaleCTM(cgContext, 1, -1);
         CGContextDrawImage(cgContext, scaledLayerBounds, backImage);
-        CGContextRestoreGState(cgContext);
     }
 
     CGContextClipToRects(cgContext, cgPaintingRects, m_paintingRects.size());
+
+    if (!m_isOpaque)
+        context.clearRect(scaledLayerBounds);
+
+#ifndef NDEBUG
+    if (m_isOpaque)
+        context.fillRect(scaledLayerBounds, Color(255, 0, 0));
+#endif
 
     context.scale(FloatSize(m_scale, m_scale));