Merge 145856 "Check to ensure MultisampleRenderbuffer creation s..."

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

 /*
  * Copyright (c) 2010, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 171 matching lines @@
     m_context->clear(clearMask);
 
     // The multisample fbo was just cleared, but we also need to clear the non-multisampled buffer too.
     if (m_multisampleFBO) {
         m_context->bindFramebuffer(GraphicsContext3D::FRAMEBUFFER, m_fbo);
         m_context->clear(GraphicsContext3D::COLOR_BUFFER_BIT);
         m_context->bindFramebuffer(GraphicsContext3D::FRAMEBUFFER, m_multisampleFBO);
     }
 }
 
+// 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;
+
+    if (m_scissorEnabled)
+        m_context->disable(GraphicsContext3D::SCISSOR_TEST);
+
+    m_context->colorMask(true, true, true, 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);
+
+    if (m_scissorEnabled)
+        m_context->enable(GraphicsContext3D::SCISSOR_TEST);
+
+    return (pixel[0] == 0xFF && pixel[1] == 0x00 && pixel[2] == 0xFF && pixel[3] == 0xFF);
+}
+
 bool DrawingBuffer::reset(const IntSize& newSize)
 {
     if (!m_context)
         return false;
 
     m_context->makeContextCurrent();
 
     int maxTextureSize = 0;
     m_context->getIntegerv(GraphicsContext3D::MAX_TEXTURE_SIZE, &maxTextureSize);
     if (newSize.height() > maxTextureSize || newSize.width() > maxTextureSize) {
@@ skipping 29 matching lines @@
         if (attributes.alpha) {
             internalColorFormat = GraphicsContext3D::RGBA;
             colorFormat = GraphicsContext3D::RGBA;
             internalRenderbufferFormat = Extensions3D::RGBA8_OES;
         } else {
             internalColorFormat = GraphicsContext3D::RGB;
             colorFormat = GraphicsContext3D::RGB;
             internalRenderbufferFormat = Extensions3D::RGB8_OES;
         }
 
-
         do {
             m_size = adjustedSize;
             // resize multisample FBO
             if (multisample()) {
                 int maxSampleCount = 0;
 
                 m_context->getIntegerv(Extensions3D::MAX_SAMPLES, &maxSampleCount);
                 int sampleCount = std::min(4, maxSampleCount);
 
                 m_context->bindFramebuffer(GraphicsContext3D::FRAMEBUFFER, m_multisampleFBO);
 
                 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);
                 if (m_context->checkFramebufferStatus(GraphicsContext3D::FRAMEBUFFER) != GraphicsContext3D::FRAMEBUFFER_COMPLETE) {
                     adjustedSize.scale(s_resourceAdjustedRatio);
                     continue;
                 }
             }
 
             // resize regular FBO
             m_context->bindFramebuffer(GraphicsContext3D::FRAMEBUFFER, m_fbo);
 
             m_context->bindTexture(GraphicsContext3D::TEXTURE_2D, m_colorBuffer);
             m_context->texImage2D(GraphicsContext3D::TEXTURE_2D, 0, internalColorFormat, m_size.width(), m_size.height(), 0, colorFormat, GraphicsContext3D::UNSIGNED_BYTE, 0);
 
             m_context->framebufferTexture2D(GraphicsContext3D::FRAMEBUFFER, GraphicsContext3D::COLOR_ATTACHMENT0, GraphicsContext3D::TEXTURE_2D, m_colorBuffer, 0);
 
             // resize the front color buffer
             if (m_separateFrontTexture) {
                 m_context->bindTexture(GraphicsContext3D::TEXTURE_2D, m_frontColorBuffer);
                 m_context->texImage2D(GraphicsContext3D::TEXTURE_2D, 0, internalColorFormat, m_size.width(), m_size.height(), 0, colorFormat, GraphicsContext3D::UNSIGNED_BYTE, 0);
             }
 
             m_context->bindTexture(GraphicsContext3D::TEXTURE_2D, 0);
 
             if (!multisample())
                 resizeDepthStencil(0);
-            if (m_context->checkFramebufferStatus(GraphicsContext3D::FRAMEBUFFER) == GraphicsContext3D::FRAMEBUFFER_COMPLETE)
-                break;
-            adjustedSize.scale(s_resourceAdjustedRatio);
+            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;
 
         } while (!adjustedSize.isEmpty());
 
         pixelDelta = m_size.width() * m_size.height();
         pixelDelta -= oldSize;
         s_currentResourceUsePixels += pixelDelta;
 
         if (!newSize.isEmpty() && adjustedSize.isEmpty()) {
             clear();
             return false;
@@ skipping 87 matching lines @@
 {
     if (!m_context)
         return;
 
     m_context->bindFramebuffer(GraphicsContext3D::FRAMEBUFFER, m_multisampleFBO ? m_multisampleFBO : m_fbo);
 }
 
 } // namespace WebCore
 
 #endif