Changeset 76717 in webkit

Timestamp:

Jan 26, 2011 2:06:45 PM (13 years ago)

Author:

kbr@google.com

Message:

2011-01-26 Kenneth Russell <​kbr@google.com>

Reviewed by James Robinson.

Fix multisampling support in DrawingBuffer
​https://bugs.webkit.org/show_bug.cgi?id=53154

Plumbed GL_ANGLE_framebuffer_multisample and
GL_ANGLE_framebuffer_blit (exposed as the unified extension
GL_CHROMIUM_framebuffer_multisample) through WebGraphicsContext3D.

• public/WebGraphicsContext3D.h:
• src/Extensions3DChromium.cpp: (WebCore::Extensions3DChromium::blitFramebuffer): (WebCore::Extensions3DChromium::renderbufferStorageMultisample):
• src/GraphicsContext3DChromium.cpp: (WebCore::GraphicsContext3DInternal::supportsExtension): (WebCore::GraphicsContext3DInternal::ensureExtensionEnabled):
• src/GraphicsContext3DInternal.h:

2011-01-26 Kenneth Russell <​kbr@google.com>

Reviewed by James Robinson.

Fix multisampling support in DrawingBuffer
​https://bugs.webkit.org/show_bug.cgi?id=53154

In DrawingBuffer's multisampling code path, fixed enum usage and a
bug where it would incorrectly redefine the depth and stencil
buffers. Hooked up multisampling code path in Chromium port.

Tested manually with some accelerated 2D canvas content.
Multisampling isn't being switched on for the accelerated 2D
canvas at the current time because it will increase fill rate
requirements and cause a large number of rebaselines.

• platform/graphics/Extensions3D.h:
• platform/graphics/chromium/DrawingBufferChromium.cpp: (WebCore::DrawingBuffer::publishToPlatformLayer):
• platform/graphics/chromium/Extensions3DChromium.h:
• platform/graphics/gpu/DrawingBuffer.cpp: (WebCore::DrawingBuffer::create): (WebCore::DrawingBuffer::reset):
• platform/graphics/opengl/Extensions3DOpenGL.cpp: (WebCore::Extensions3DOpenGL::supports):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/Extensions3D.h (modified) (2 diffs)
• WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp (modified) (1 diff)
• WebCore/platform/graphics/chromium/Extensions3DChromium.h (modified) (1 diff)
• WebCore/platform/graphics/gpu/DrawingBuffer.cpp (modified) (4 diffs)
• WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/public/WebGraphicsContext3D.h (modified) (1 diff)
• WebKit/chromium/src/Extensions3DChromium.cpp (modified) (1 diff)
• WebKit/chromium/src/GraphicsContext3DChromium.cpp (modified) (6 diffs)
• WebKit/chromium/src/GraphicsContext3DInternal.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-01-26  Kenneth Russell  <kbr@google.com>
+
+        Reviewed by James Robinson.
+
+        Fix multisampling support in DrawingBuffer
+        https://bugs.webkit.org/show_bug.cgi?id=53154
+
+        In DrawingBuffer's multisampling code path, fixed enum usage and a
+        bug where it would incorrectly redefine the depth and stencil
+        buffers. Hooked up multisampling code path in Chromium port.
+
+        Tested manually with some accelerated 2D canvas content.
+        Multisampling isn't being switched on for the accelerated 2D
+        canvas at the current time because it will increase fill rate
+        requirements and cause a large number of rebaselines.
+
+        * platform/graphics/Extensions3D.h:
+        * platform/graphics/chromium/DrawingBufferChromium.cpp:
+        (WebCore::DrawingBuffer::publishToPlatformLayer):
+        * platform/graphics/chromium/Extensions3DChromium.h:
+        * platform/graphics/gpu/DrawingBuffer.cpp:
+        (WebCore::DrawingBuffer::create):
+        (WebCore::DrawingBuffer::reset):
+        * platform/graphics/opengl/Extensions3DOpenGL.cpp:
+        (WebCore::Extensions3DOpenGL::supports):
+
 2011-01-26  Tony Chang  <tony@chromium.org>
 

trunk/Source/WebCore/platform/graphics/Extensions3D.h

@@ -53 +53 @@
     //   GL_OES_texture_float
     //   GL_OES_standard_derivatives
+    //   GL_OES_rgb8_rgba8
 
     // Takes full name of extension; for example,
@@ -88 +89 @@
         // GL_OES_standard_derivatives names
         FRAGMENT_SHADER_DERIVATIVE_HINT_OES = 0x8B8B,
+
+        // GL_OES_rgb8_rgba8 names
+        RGB8_OES = 0x8051,
+        RGBA8_OES = 0x8058,
     };
 

trunk/Source/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp

@@ -120 +120 @@
     if (m_callback)
         m_callback->willPublish();
+    if (multisample())
+        commit();
     unsigned parentTexture = m_internal->platformLayer->textureId();
     // FIXME: We do the copy in the canvas' (child) context so that it executes in the correct order relative to

trunk/Source/WebCore/platform/graphics/chromium/Extensions3DChromium.h

@@ -45 +45 @@
     virtual void ensureEnabled(const String&);
     virtual int getGraphicsResetStatusARB();
-    virtual void blitFramebuffer(long srcX0, long srcY0, long srcX1, long srcY1, long dstX0, long dstY0, long dstX1, long dstY1, unsigned long mask, unsigned long filter) { }
-    virtual void renderbufferStorageMultisample(unsigned long target, unsigned long samples, unsigned long internalformat, unsigned long width, unsigned long height) { }
+    virtual void blitFramebuffer(long srcX0, long srcY0, long srcX1, long srcY1, long dstX0, long dstY0, long dstX1, long dstY1, unsigned long mask, unsigned long filter);
+    virtual void renderbufferStorageMultisample(unsigned long target, unsigned long samples, unsigned long internalformat, unsigned long width, unsigned long height);
 
     enum {

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

@@ -42 +42 @@
 {
     Extensions3D* extensions = context->getExtensions();
-    bool multisampleSupported = extensions->supports("GL_ANGLE_framebuffer_blit") && extensions->supports("GL_ANGLE_framebuffer_multisample");
+    bool multisampleSupported = extensions->supports("GL_ANGLE_framebuffer_blit") && extensions->supports("GL_ANGLE_framebuffer_multisample") && extensions->supports("GL_OES_rgb8_rgba8");
     if (multisampleSupported) {
         extensions->ensureEnabled("GL_ANGLE_framebuffer_blit");
         extensions->ensureEnabled("GL_ANGLE_framebuffer_multisample");
+        extensions->ensureEnabled("GL_OES_rgb8_rgba8");
     }
     bool packedDepthStencilSupported = extensions->supports("GL_OES_packed_depth_stencil");
@@ -154 +155 @@
     
     const GraphicsContext3D::Attributes& attributes = m_context->getContextAttributes();
-    unsigned long internalColorFormat, colorFormat;
+    unsigned long internalColorFormat, colorFormat, internalRenderbufferFormat;
     if (attributes.alpha) {
         internalColorFormat = GraphicsContext3D::RGBA;
         colorFormat = GraphicsContext3D::RGBA;
+        internalRenderbufferFormat = Extensions3D::RGBA8_OES;
     } else {
         internalColorFormat = GraphicsContext3D::RGB;
         colorFormat = GraphicsContext3D::RGB;
+        internalRenderbufferFormat = Extensions3D::RGB8_OES;
     }
 
@@ -174 +177 @@
 
         m_context->bindRenderbuffer(GraphicsContext3D::RENDERBUFFER, m_multisampleColorBuffer);
-        m_context->getExtensions()->renderbufferStorageMultisample(GraphicsContext3D::RENDERBUFFER, sampleCount, internalColorFormat, m_size.width(), m_size.height());
+        m_context->getExtensions()->renderbufferStorageMultisample(GraphicsContext3D::RENDERBUFFER, sampleCount, internalRenderbufferFormat, m_size.width(), m_size.height());
         m_context->framebufferRenderbuffer(GraphicsContext3D::FRAMEBUFFER, GraphicsContext3D::COLOR_ATTACHMENT0, GraphicsContext3D::RENDERBUFFER, m_multisampleColorBuffer);
         resizeDepthStencil(sampleCount);
@@ -191 +194 @@
     m_context->framebufferTexture2D(GraphicsContext3D::FRAMEBUFFER, GraphicsContext3D::COLOR_ATTACHMENT0, GraphicsContext3D::TEXTURE_2D, m_colorBuffer, 0);
     m_context->bindTexture(GraphicsContext3D::TEXTURE_2D, 0);
-    resizeDepthStencil(0);
+    if (!multisample())
+        resizeDepthStencil(0);
     if (m_context->checkFramebufferStatus(GraphicsContext3D::FRAMEBUFFER) != GraphicsContext3D::FRAMEBUFFER_COMPLETE) {
         // Cleanup

trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp

@@ -80 +80 @@
         return m_availableExtensions.contains("GL_EXT_framebuffer_multisample");
 
+    // Desktop GL always supports GL_OES_rgb8_rgba8.
+    if (name == "GL_OES_rgb8_rgba8")
+        return true;
+
     // If GL_ARB_texture_float is available then we report GL_OES_texture_float and
     // GL_OES_texture_half_float as available.

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-01-26  Kenneth Russell  <kbr@google.com>
+
+        Reviewed by James Robinson.
+
+        Fix multisampling support in DrawingBuffer
+        https://bugs.webkit.org/show_bug.cgi?id=53154
+
+        Plumbed GL_ANGLE_framebuffer_multisample and
+        GL_ANGLE_framebuffer_blit (exposed as the unified extension
+        GL_CHROMIUM_framebuffer_multisample) through WebGraphicsContext3D.
+
+        * public/WebGraphicsContext3D.h:
+        * src/Extensions3DChromium.cpp:
+        (WebCore::Extensions3DChromium::blitFramebuffer):
+        (WebCore::Extensions3DChromium::renderbufferStorageMultisample):
+        * src/GraphicsContext3DChromium.cpp:
+        (WebCore::GraphicsContext3DInternal::supportsExtension):
+        (WebCore::GraphicsContext3DInternal::ensureExtensionEnabled):
+        * src/GraphicsContext3DInternal.h:
+
 2011-01-26  Tony Chang  <tony@chromium.org>
 

trunk/Source/WebKit/chromium/public/WebGraphicsContext3D.h

@@ -141 +141 @@
     virtual void requestExtensionCHROMIUM(const char*) = 0;
 
+    // GL_CHROMIUM_framebuffer_multisample
+    virtual void blitFramebufferCHROMIUM(int srcX0, int srcY0, int srcX1, int srcY1, int dstX0, int dstY0, int dstX1, int dstY1, unsigned mask, unsigned filter) = 0;
+    virtual void renderbufferStorageMultisampleCHROMIUM(unsigned long target, int samples, unsigned internalformat, unsigned width, unsigned height) = 0;
+
     // The entry points below map directly to the OpenGL ES 2.0 API.
     // See: http://www.khronos.org/registry/gles/

trunk/Source/WebKit/chromium/src/Extensions3DChromium.cpp

@@ -63 +63 @@
 }
 
+void Extensions3DChromium::blitFramebuffer(long srcX0, long srcY0, long srcX1, long srcY1, long dstX0, long dstY0, long dstX1, long dstY1, unsigned long mask, unsigned long filter)
+{
+    m_internal->blitFramebufferCHROMIUM(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
+}
+
+void Extensions3DChromium::renderbufferStorageMultisample(unsigned long target, unsigned long samples, unsigned long internalformat, unsigned long width, unsigned long height)
+{
+    m_internal->renderbufferStorageMultisampleCHROMIUM(target, samples, internalformat, width, height);
+}
+
 void* Extensions3DChromium::mapBufferSubDataCHROMIUM(unsigned target, int offset, int size, unsigned access)
 {

trunk/Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp

@@ -365 +365 @@
 }
 
+#define DELEGATE_TO_IMPL_10(name, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10) \
+void GraphicsContext3DInternal::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5, t6 a6, t7 a7, t8 a8, t9 a9, t10 a10) \
+{ \
+    m_impl->name(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10); \
+}
+
 DELEGATE_TO_IMPL_R(makeContextCurrent, bool)
 
@@ -692 +698 @@
 }
 
+String mapExtensionName(const String& name)
+{
+    if (name == "GL_ANGLE_framebuffer_blit"
+        || name == "GL_ANGLE_framebuffer_multisample")
+        return "GL_CHROMIUM_framebuffer_multisample";
+    return name;
+}
+
 } // anonymous namespace
 
@@ -711 +725 @@
 {
     initializeExtensions();
-    return m_enabledExtensions.contains(name) || m_requestableExtensions.contains(name);
+    String mappedName = mapExtensionName(name);
+    return m_enabledExtensions.contains(mappedName) || m_requestableExtensions.contains(mappedName);
 }
 
@@ -718 +733 @@
     initializeExtensions();
 
-    if (m_enabledExtensions.contains(name))
+    String mappedName = mapExtensionName(name);
+    if (m_enabledExtensions.contains(mappedName))
         return true;
 
-    if (m_requestableExtensions.contains(name)) {
-        m_impl->requestExtensionCHROMIUM(name.ascii().data());
+    if (m_requestableExtensions.contains(mappedName)) {
+        m_impl->requestExtensionCHROMIUM(mappedName.ascii().data());
         m_enabledExtensions.clear();
         m_requestableExtensions.clear();
@@ -729 +745 @@
 
     initializeExtensions();
-    return m_enabledExtensions.contains(name);
+    return m_enabledExtensions.contains(mappedName);
 }
 
@@ -737 +753 @@
 DELEGATE_TO_IMPL_1(unmapTexSubImage2DCHROMIUM, const void*)
 DELEGATE_TO_IMPL_2(copyTextureToParentTextureCHROMIUM, Platform3DObject, Platform3DObject)
+DELEGATE_TO_IMPL_10(blitFramebufferCHROMIUM, GC3Dint, GC3Dint, GC3Dint, GC3Dint, GC3Dint, GC3Dint, GC3Dint, GC3Dint, GC3Dbitfield, GC3Denum)
+DELEGATE_TO_IMPL_5(renderbufferStorageMultisampleCHROMIUM, GC3Denum, GC3Dsizei, GC3Denum, GC3Dsizei, GC3Dsizei)
 
 //----------------------------------------------------------------------

trunk/Source/WebKit/chromium/src/GraphicsContext3DInternal.h

@@ -259 +259 @@
     void copyTextureToParentTextureCHROMIUM(Platform3DObject texture, Platform3DObject parentTexture);
 
+    // GL_CHROMIUM_framebuffer_multisample
+    void blitFramebufferCHROMIUM(GC3Dint srcX0, GC3Dint srcY0, GC3Dint srcX1, GC3Dint srcY1, GC3Dint dstX0, GC3Dint dstY0, GC3Dint dstX1, GC3Dint dstY1, GC3Dbitfield mask, GC3Denum filter);
+    void renderbufferStorageMultisampleCHROMIUM(GC3Denum target, GC3Dsizei samples, GC3Denum internalformat, GC3Dsizei width, GC3Dsizei height);
+
 private:
     OwnPtr<WebKit::WebGraphicsContext3D> m_impl;