Changeset 57322 in webkit

Timestamp:

Apr 9, 2010 3:06:56 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-09 Zhenyao Mo <​zmo@google.com>

Reviewed by Dimitri Glazkov.

Must resolve multisampled back buffer during copyTexImage2D and copyTexSubImage2D
​https://bugs.webkit.org/show_bug.cgi?id=37174

• fast/canvas/webgl/copy-tex-image-and-sub-image-2d-expected.txt: Added.
• fast/canvas/webgl/copy-tex-image-and-sub-image-2d.html: Added.
• fast/canvas/webgl/resources/utils3d.js: Add ContextAttributes parameter to initWebGL function.

2010-04-09 Zhenyao Mo <​zmo@google.com>

Reviewed by Dimitri Glazkov.

Must resolve multisampled back buffer during copyTexImage2D and copyTexSubImage2D
​https://bugs.webkit.org/show_bug.cgi?id=37174

Test: fast/canvas/webgl/copy-tex-image-and-sub-image-2d.html

• platform/graphics/mac/GraphicsContext3DMac.cpp: resolve multisampled back buffer during copyTexImage2D and copyTexSubImage2D. (WebCore::GraphicsContext3D::copyTexImage2D): (WebCore::GraphicsContext3D::copyTexSubImage2D):

2010-04-09 Zhenyao Mo <​zmo@google.com>

Reviewed by Dimitri Glazkov.

Must resolve multisampled back buffer during copyTexImage2D and copyTexSubImage2D
​https://bugs.webkit.org/show_bug.cgi?id=37174

Test: fast/canvas/webgl/copy-tex-image-and-sub-image-2d.html

• src/WebGraphicsContext3DDefaultImpl.cpp: Resolve multisampled back buffer during copyTexImage2D and copyTexSubImage2D. (WebKit::WebGraphicsContext3DDefaultImpl::copyTexImage2D): (WebKit::WebGraphicsContext3DDefaultImpl::copyTexSubImage2D):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/webgl/copy-tex-image-and-sub-image-2d-expected.txt (added)
• LayoutTests/fast/canvas/webgl/copy-tex-image-and-sub-image-2d.html (added)
• LayoutTests/fast/canvas/webgl/resources/utils3d.js (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/mac/GraphicsContext3DMac.cpp (modified) (2 diffs)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-04-09  Zhenyao Mo  <zmo@google.com>
+
+        Reviewed by Dimitri Glazkov.
+
+        Must resolve multisampled back buffer during copyTexImage2D and copyTexSubImage2D
+        https://bugs.webkit.org/show_bug.cgi?id=37174
+
+        * fast/canvas/webgl/copy-tex-image-and-sub-image-2d-expected.txt: Added.
+        * fast/canvas/webgl/copy-tex-image-and-sub-image-2d.html: Added.
+        * fast/canvas/webgl/resources/utils3d.js: Add ContextAttributes parameter to initWebGL function.
+
 2010-04-09  Kenneth Rohde Christiansen  <kenneth@webkit.org>
 

trunk/LayoutTests/fast/canvas/webgl/resources/utils3d.js

@@ -18 +18 @@
 // an empty function on other browsers.
 //
-function initWebGL(canvasName, vshader, fshader, attribs, clearColor, clearDepth)
+function initWebGL(canvasName, vshader, fshader, attribs, clearColor, clearDepth, contextAttribs)
 {
     var canvas = document.getElementById(canvasName);
-    var gl = canvas.getContext("experimental-webgl");
+    var gl = canvas.getContext("experimental-webgl", contextAttribs);
     if (!gl) {
         alert("No WebGL context found");

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-09  Zhenyao Mo  <zmo@google.com>
+
+        Reviewed by Dimitri Glazkov.
+
+        Must resolve multisampled back buffer during copyTexImage2D and copyTexSubImage2D
+        https://bugs.webkit.org/show_bug.cgi?id=37174
+
+        Test: fast/canvas/webgl/copy-tex-image-and-sub-image-2d.html
+
+        * platform/graphics/mac/GraphicsContext3DMac.cpp: resolve multisampled back buffer during copyTexImage2D and copyTexSubImage2D.
+        (WebCore::GraphicsContext3D::copyTexImage2D):
+        (WebCore::GraphicsContext3D::copyTexSubImage2D):
+
 2010-04-09  Evan Stade  <estade@chromium.org>
 

trunk/WebCore/platform/graphics/mac/GraphicsContext3DMac.cpp

@@ -500 +500 @@
 {
     ensureContext(m_contextObj);
+    if (m_attrs.antialias && m_boundFBO == m_multisampleFBO) {
+        ::glBindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT, m_multisampleFBO);
+        ::glBindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, m_fbo);
+        ::glBlitFramebufferEXT(x, y, x + width, y + height, x, y, x + width, y + height, GL_COLOR_BUFFER_BIT, GL_LINEAR);
+        ::glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_fbo);
+    }
     ::glCopyTexImage2D(target, level, internalformat, x, y, width, height, border);
+    if (m_attrs.antialias && m_boundFBO == m_multisampleFBO)
+        ::glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_multisampleFBO);
 }
 
@@ -506 +514 @@
 {
     ensureContext(m_contextObj);
+    if (m_attrs.antialias && m_boundFBO == m_multisampleFBO) {
+        ::glBindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT, m_multisampleFBO);
+        ::glBindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, m_fbo);
+        ::glBlitFramebufferEXT(x, y, x + width, y + height, x, y, x + width, y + height, GL_COLOR_BUFFER_BIT, GL_LINEAR);
+        ::glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_fbo);
+    }
     ::glCopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
+    if (m_attrs.antialias && m_boundFBO == m_multisampleFBO)
+        ::glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_multisampleFBO);
 }
 

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-04-09  Zhenyao Mo  <zmo@google.com>
+
+        Reviewed by Dimitri Glazkov.
+
+        Must resolve multisampled back buffer during copyTexImage2D and copyTexSubImage2D
+        https://bugs.webkit.org/show_bug.cgi?id=37174
+
+        Test: fast/canvas/webgl/copy-tex-image-and-sub-image-2d.html
+
+        * src/WebGraphicsContext3DDefaultImpl.cpp: Resolve multisampled back buffer during copyTexImage2D and copyTexSubImage2D.
+        (WebKit::WebGraphicsContext3DDefaultImpl::copyTexImage2D):
+        (WebKit::WebGraphicsContext3DDefaultImpl::copyTexSubImage2D):
+
 2010-04-07  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp

@@ -839 +839 @@
 DELEGATE_TO_GL_1(compileShader, CompileShader, WebGLId)
 
-DELEGATE_TO_GL_8(copyTexImage2D, CopyTexImage2D, unsigned long, long, unsigned long, long, long, unsigned long, unsigned long, long)
-
-DELEGATE_TO_GL_8(copyTexSubImage2D, CopyTexSubImage2D, unsigned long, long, long, long, long, long, unsigned long, unsigned long)
+void WebGraphicsContext3DDefaultImpl::copyTexImage2D(unsigned long target, long level, unsigned long internalformat,
+                                                     long x, long y, unsigned long width, unsigned long height, long border)
+{
+    makeContextCurrent();
+#ifndef RENDER_TO_DEBUGGING_WINDOW
+    if (m_attributes.antialias && m_boundFBO == m_multisampleFBO) {
+        glBindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT, m_multisampleFBO);
+        glBindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, m_fbo);
+        glBlitFramebufferEXT(x, y, x + width, y + height, x, y, x + width, y + height, GL_COLOR_BUFFER_BIT, GL_LINEAR);
+        glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_fbo);
+    }
+#endif
+    glCopyTexImage2D(target, level, internalformat, x, y, width, height, border);
+#ifndef RENDER_TO_DEBUGGING_WINDOW
+    if (m_attributes.antialias && m_boundFBO == m_multisampleFBO)
+        glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_boundFBO);
+#endif
+}
+
+void WebGraphicsContext3DDefaultImpl::copyTexSubImage2D(unsigned long target, long level, long xoffset, long yoffset,
+                                                        long x, long y, unsigned long width, unsigned long height)
+{
+    makeContextCurrent();
+#ifndef RENDER_TO_DEBUGGING_WINDOW
+    if (m_attributes.antialias && m_boundFBO == m_multisampleFBO) {
+        glBindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT, m_multisampleFBO);
+        glBindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, m_fbo);
+        glBlitFramebufferEXT(x, y, x + width, y + height, x, y, x + width, y + height, GL_COLOR_BUFFER_BIT, GL_LINEAR);
+        glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_fbo);
+    }
+#endif
+    glCopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
+#ifndef RENDER_TO_DEBUGGING_WINDOW
+    if (m_attributes.antialias && m_boundFBO == m_multisampleFBO)
+        glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_boundFBO);
+#endif
+}
 
 DELEGATE_TO_GL_1(cullFace, CullFace, unsigned long)