Changeset 145649 in webkit

Timestamp:

Mar 12, 2013 6:14:34 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r145280.
​http://trac.webkit.org/changeset/145280
​https://bugs.webkit.org/show_bug.cgi?id=112217

This patch broke chromium WebGL conformance tests (Requested
by shawnsingh on #webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2013-03-12

• platform/graphics/gpu/DrawingBuffer.cpp:

(WebCore::DrawingBuffer::reset):

• platform/graphics/gpu/DrawingBuffer.h:

(DrawingBuffer):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gpu/DrawingBuffer.cpp (modified) (4 diffs)
• platform/graphics/gpu/DrawingBuffer.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-12  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r145280.
+        http://trac.webkit.org/changeset/145280
+        https://bugs.webkit.org/show_bug.cgi?id=112217
+
+        This patch broke chromium WebGL conformance tests (Requested
+        by shawnsingh on #webkit).
+
+        * platform/graphics/gpu/DrawingBuffer.cpp:
+        (WebCore::DrawingBuffer::reset):
+        * platform/graphics/gpu/DrawingBuffer.h:
+        (DrawingBuffer):
+
 2013-03-12  Dean Jackson  <dino@apple.com>
 

trunk/Source/WebCore/platform/graphics/gpu/DrawingBuffer.cpp

@@ -190 +190 @@
 }
 
-// Only way to ensure that we're not getting a bad framebuffer on some AMD/OSX devices.
-// FIXME: This can be removed once renderbufferStorageMultisample starts reporting GL_OUT_OF_MEMORY properly.
-bool DrawingBuffer::checkBufferIntegrity()
-{
-    if (!m_multisampleFBO)
-        return true;
-
-    m_context->bindFramebuffer(GraphicsContext3D::FRAMEBUFFER, m_multisampleFBO);
-    m_context->clearColor(1.0f, 0.0f, 1.0f, 1.0f);
-    m_context->clear(GraphicsContext3D::COLOR_BUFFER_BIT);
-
-    commit(0, 0, 1, 1);
-
-    unsigned char pixel[4] = {0, 0, 0, 0};
-    m_context->readPixels(0, 0, 1, 1, GraphicsContext3D::RGBA, GraphicsContext3D::UNSIGNED_BYTE, &pixel);
-
-    return (pixel[0] == 0xFF && pixel[1] == 0x00 && pixel[2] == 0xFF && pixel[3] == 0xFF);
-}
-
 bool DrawingBuffer::reset(const IntSize& newSize)
 {
@@ -258 +239 @@
         }
 
+
         do {
             m_size = adjustedSize;
@@ -271 +253 @@
                 m_context->bindRenderbuffer(GraphicsContext3D::RENDERBUFFER, m_multisampleColorBuffer);
                 m_context->getExtensions()->renderbufferStorageMultisample(GraphicsContext3D::RENDERBUFFER, sampleCount, internalRenderbufferFormat, m_size.width(), m_size.height());
-
-                if (m_context->getError() == GraphicsContext3D::OUT_OF_MEMORY) {
-                    adjustedSize.scale(s_resourceAdjustedRatio);
-                    continue;
-                }
-
                 m_context->framebufferRenderbuffer(GraphicsContext3D::FRAMEBUFFER, GraphicsContext3D::COLOR_ATTACHMENT0, GraphicsContext3D::RENDERBUFFER, m_multisampleColorBuffer);
                 resizeDepthStencil(sampleCount);
@@ -303 +279 @@
             if (!multisample())
                 resizeDepthStencil(0);
-            if (m_context->checkFramebufferStatus(GraphicsContext3D::FRAMEBUFFER) != GraphicsContext3D::FRAMEBUFFER_COMPLETE) {
-                adjustedSize.scale(s_resourceAdjustedRatio);
-                continue;
-            }
-
-#if OS(DARWIN)
-            // FIXME: This can be removed once renderbufferStorageMultisample starts reporting GL_OUT_OF_MEMORY properly on OSX.
-            if (!checkBufferIntegrity()) {
-                adjustedSize.scale(s_resourceAdjustedRatio);
-                continue;
-            }
-#endif
-
-            break;
+            if (m_context->checkFramebufferStatus(GraphicsContext3D::FRAMEBUFFER) == GraphicsContext3D::FRAMEBUFFER_COMPLETE)
+                break;
+            adjustedSize.scale(s_resourceAdjustedRatio);
 
         } while (!adjustedSize.isEmpty());

trunk/Source/WebCore/platform/graphics/gpu/DrawingBuffer.h

@@ -141 +141 @@
     void initialize(const IntSize&);
 
-    bool checkBufferIntegrity();
-
     PreserveDrawingBuffer m_preserveDrawingBuffer;
     AlphaRequirement m_alpha;