Changeset 166563 in webkit

Timestamp:

Mar 31, 2014, 10:37:12 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[WebGL][OpenGLES] Enable MSAA support for WebGL Canvas
​https://bugs.webkit.org/show_bug.cgi?id=130955

Patch by Byungseon Shin <​sun.shin@lge.com> on 2014-03-31
Reviewed by Dean Jackson.

To avoid aliasing issues when we render content to WebGL canvas,

we need to implement MSAA support.

• Imagination OpenGLES GPU Driver already support MSAA, so we need a separate code path to enable it.

• platform/graphics/Extensions3D.h:
• platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:

(WebCore::Extensions3DOpenGLCommon::Extensions3DOpenGLCommon):

• platform/graphics/opengl/Extensions3DOpenGLCommon.h:

(WebCore::Extensions3DOpenGLCommon::isImagination):

• platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp:

(WebCore::GraphicsContext3D::reshapeFBOs):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/Extensions3D.h (modified) (3 diffs)
• platform/graphics/opengl/Extensions3DOpenGLCommon.cpp (modified) (2 diffs)
• platform/graphics/opengl/Extensions3DOpenGLCommon.h (modified) (2 diffs)
• platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-03-31  Byungseon Shin  <sun.shin@lge.com>
+
+        [WebGL][OpenGLES] Enable MSAA support for WebGL Canvas
+        https://bugs.webkit.org/show_bug.cgi?id=130955
+
+        Reviewed by Dean Jackson.
+
+        To avoid aliasing issues when we render content to WebGL canvas,
+         we need to implement MSAA support.
+        - Imagination OpenGLES GPU Driver already support MSAA, so we
+         need a separate code path to enable it.
+
+        * platform/graphics/Extensions3D.h:
+        * platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:
+        (WebCore::Extensions3DOpenGLCommon::Extensions3DOpenGLCommon):
+        * platform/graphics/opengl/Extensions3DOpenGLCommon.h:
+        (WebCore::Extensions3DOpenGLCommon::isImagination):
+        * platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp:
+        (WebCore::GraphicsContext3D::reshapeFBOs):
+
 2014-03-31  Alexey Proskuryakov  <ap@apple.com>
 

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

@@ -53 +53 @@
     //   GL_EXT_packed_depth_stencil / GL_OES_packed_depth_stencil
     //   GL_ANGLE_framebuffer_blit / GL_ANGLE_framebuffer_multisample
+    //   GL_IMG_multisampled_render_to_texture
     //   GL_OES_texture_float
     //   GL_OES_texture_float_linear
@@ -111 +112 @@
         FRAMEBUFFER_INCOMPLETE_MULTISAMPLE = 0x8D56,
         MAX_SAMPLES = 0x8D57,
+
+        // GL_IMG_multisampled_render_to_texture
+        RENDERBUFFER_SAMPLES_IMG = 0x9133,
+        FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_IMG = 0x9134,
+        MAX_SAMPLES_IMG = 0x9135,
+        TEXTURE_SAMPLES_IMG = 0x9136,
 
         // GL_OES_standard_derivatives names
@@ -236 +243 @@
     virtual bool isAMD() = 0;
     virtual bool isIntel() = 0;
+    virtual bool isImagination() = 0;
     virtual String vendor() = 0;
 

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

@@ -58 +58 @@
     , m_isAMD(false)
     , m_isIntel(false)
+    , m_isImagination(false)
     , m_maySupportMultisampling(true)
     , m_requiresBuiltInFunctionEmulation(false)
@@ -71 +72 @@
     if (vendorComponents.contains("intel"))
         m_isIntel = true;
+    if (vendorComponents.contains("imagination"))
+        m_isImagination = true;
 
 #if PLATFORM(MAC)

trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.h

@@ -63 +63 @@
     virtual bool isAMD() { return m_isAMD; }
     virtual bool isIntel() { return m_isIntel; }
+    virtual bool isImagination() { return m_isImagination; }
     virtual String vendor() { return m_vendor; }
 
@@ -85 +86 @@
     bool m_isAMD;
     bool m_isIntel;
+    bool m_isImagination;
     bool m_maySupportMultisampling;
     bool m_requiresBuiltInFunctionEmulation;

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

@@ -111 +111 @@
     }
 
-    // We don't support antialiasing yet. See GraphicsContext3D::validateAttributes.
-    ASSERT(!m_attrs.antialias);
-
-    if (m_attrs.stencil || m_attrs.depth) {
-        // Use a 24 bit depth buffer where we know we have it.
-        if (supportPackedDepthStencilBuffer) {
-            ::glBindRenderbuffer(GL_RENDERBUFFER, m_depthStencilBuffer);
-            ::glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH24_STENCIL8_OES, width, height);
-            if (m_attrs.stencil)
-                ::glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, m_depthStencilBuffer);
-            if (m_attrs.depth)
-                ::glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, m_depthStencilBuffer);
+    if (extensions->isImagination() && m_attrs.antialias) {
+        GLint maxSampleCount;
+        ::glGetIntegerv(Extensions3D::MAX_SAMPLES_IMG, &maxSampleCount); 
+        GLint sampleCount = std::min(8, maxSampleCount);
+
+        extensions->framebufferTexture2DMultisampleIMG(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, m_texture, 0, sampleCount);
+
+        if (m_attrs.stencil || m_attrs.depth) {
+            // Use a 24 bit depth buffer where we know we have it.
+            if (supportPackedDepthStencilBuffer) {
+                ::glBindRenderbuffer(GL_RENDERBUFFER, m_depthStencilBuffer);
+                extensions->renderbufferStorageMultisample(GL_RENDERBUFFER, sampleCount, GL_DEPTH24_STENCIL8_OES, width, height);
+                if (m_attrs.stencil)
+                    ::glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, m_depthStencilBuffer);
+                if (m_attrs.depth)
+                    ::glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, m_depthStencilBuffer);
+            } else {
+                if (m_attrs.stencil) {
+                    ::glBindRenderbuffer(GL_RENDERBUFFER, m_stencilBuffer);
+                    extensions->renderbufferStorageMultisample(GL_RENDERBUFFER, sampleCount, GL_STENCIL_INDEX8, width, height);
+                    ::glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, m_stencilBuffer);
+                }
+                if (m_attrs.depth) {
+                    ::glBindRenderbuffer(GL_RENDERBUFFER, m_depthBuffer);
+                    extensions->renderbufferStorageMultisample(GL_RENDERBUFFER, sampleCount, GL_DEPTH_COMPONENT16, width, height);
+                    ::glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, m_depthBuffer);
+                }
+            }
             ::glBindRenderbuffer(GL_RENDERBUFFER, 0);
-        } else {
-            if (m_attrs.stencil) {
-                ::glBindRenderbuffer(GL_RENDERBUFFER, m_stencilBuffer);
-                ::glRenderbufferStorage(GL_RENDERBUFFER, GL_STENCIL_INDEX8, width, height);
-                ::glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, m_stencilBuffer);
-            }
-            if (m_attrs.depth) {
-                ::glBindRenderbuffer(GL_RENDERBUFFER, m_depthBuffer);
-                ::glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT16, width, height);
-                ::glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, m_depthBuffer);
+        }
+    } else {
+        if (m_attrs.stencil || m_attrs.depth) {
+            // Use a 24 bit depth buffer where we know we have it.
+            if (supportPackedDepthStencilBuffer) {
+                ::glBindRenderbuffer(GL_RENDERBUFFER, m_depthStencilBuffer);
+                ::glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH24_STENCIL8_OES, width, height);
+                if (m_attrs.stencil)
+                    ::glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, m_depthStencilBuffer);
+                if (m_attrs.depth)
+                    ::glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, m_depthStencilBuffer);
+            } else {
+                if (m_attrs.stencil) {
+                    ::glBindRenderbuffer(GL_RENDERBUFFER, m_stencilBuffer);
+                    ::glRenderbufferStorage(GL_RENDERBUFFER, GL_STENCIL_INDEX8, width, height);
+                    ::glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, m_stencilBuffer);
+                }
+                if (m_attrs.depth) {
+                    ::glBindRenderbuffer(GL_RENDERBUFFER, m_depthBuffer);
+                    ::glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT16, width, height);
+                    ::glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, m_depthBuffer);
+                }
             }
             ::glBindRenderbuffer(GL_RENDERBUFFER, 0);