Changeset 70552 in webkit

Timestamp:

Oct 26, 2010 12:01:19 PM (13 years ago)

Author:

senorblanco@chromium.org

Message:

2010-10-22 Stephen White <​senorblanco@chromium.org>

Reviewed by Kenneth Russell.

Implement copy-texture-to-parent-texture API for WebGraphicsContext3DDefaultImpl.
​https://bugs.webkit.org/show_bug.cgi?id=48152

This allows the in-process implementation to do accelerated canvas and
accelerated compositing together. It requires some changes landed
in chromium 63528, so this patch also rolls chromium DEPS to 63722
(current LKGR).

Covered by fast/canvas/arc360.html, and many more when run with
--accelerated-compositing and --accelerated-2d-canvas.

• src/WebGraphicsContext3DDefaultImpl.cpp: (WebKit::WebGraphicsContext3DDefaultImpl::WebGraphicsContext3DDefaultImpl): Add member vars to save the currently-bound texture and for the texture-to-texture FBO. (WebKit::WebGraphicsContext3DDefaultImpl::~WebGraphicsContext3DDefaultImpl): Delete the texture-to-texture FBO on destruction.

(WebKit::WebGraphicsContext3DDefaultImpl::initialize):
Generate the texture-to-texture FBO.
(WebKit::WebGraphicsContext3DDefaultImpl::supportsCopyTextureToParentTextureCHROMIUM):
Check for support of the glGetTexLevelParameteriv function (required
for this implementation).
(WebKit::WebGraphicsContext3DDefaultImpl::copyTextureToParentTextureCHROMIUM):
Implement the extension: bind the FBO, bind the child texture, then
do a glCopyTexImage2D() into the parent texture.
(WebKit::WebGraphicsContext3DDefaultImpl::bindTexture):
Record the newly-bound texture in m_boundTexture.

• src/WebGraphicsContext3DDefaultImpl.h: Add the two new member variables.
• src/WebViewImpl.cpp: (WebKit::WebViewImpl::graphicsContext3D): Make sure the graphics context is reshaped to the correct size on all platforms.

Location:

trunk/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• DEPS (modified) (1 diff)
• src/WebGraphicsContext3DDefaultImpl.cpp (modified) (5 diffs)
• src/WebGraphicsContext3DDefaultImpl.h (modified) (1 diff)
• src/WebViewImpl.cpp (modified) (1 diff)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-10-22  Stephen White  <senorblanco@chromium.org>
+
+        Reviewed by Kenneth Russell.
+
+        Implement copy-texture-to-parent-texture API for WebGraphicsContext3DDefaultImpl.
+        https://bugs.webkit.org/show_bug.cgi?id=48152
+        
+        This allows the in-process implementation to do accelerated canvas and
+        accelerated compositing together.  It requires some changes landed
+        in chromium 63528, so this patch also rolls chromium DEPS to 63722
+        (current LKGR).
+
+        Covered by fast/canvas/arc360.html, and many more when run with
+        --accelerated-compositing and --accelerated-2d-canvas.
+
+        * src/WebGraphicsContext3DDefaultImpl.cpp:
+        (WebKit::WebGraphicsContext3DDefaultImpl::WebGraphicsContext3DDefaultImpl):
+        Add member vars to save the currently-bound texture and for the
+        texture-to-texture FBO.
+        (WebKit::WebGraphicsContext3DDefaultImpl::~WebGraphicsContext3DDefaultImpl):
+        Delete the texture-to-texture FBO on destruction.
+
+        (WebKit::WebGraphicsContext3DDefaultImpl::initialize):
+        Generate the texture-to-texture FBO.
+        (WebKit::WebGraphicsContext3DDefaultImpl::supportsCopyTextureToParentTextureCHROMIUM):
+        Check for support of the glGetTexLevelParameteriv function (required
+        for this implementation).
+        (WebKit::WebGraphicsContext3DDefaultImpl::copyTextureToParentTextureCHROMIUM):
+        Implement the extension:  bind the FBO, bind the child texture, then
+        do a glCopyTexImage2D() into the parent texture.
+        (WebKit::WebGraphicsContext3DDefaultImpl::bindTexture):
+        Record the newly-bound texture in m_boundTexture.
+        * src/WebGraphicsContext3DDefaultImpl.h:
+        Add the two new member variables.
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::graphicsContext3D):
+        Make sure the graphics context is reshaped to the correct size on all
+        platforms.
+
 2010-10-26  Alexey Marinichev  <amarinichev@chromium.org>
 

trunk/WebKit/chromium/DEPS

@@ -33 +33 @@
 vars = {
   'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
-  'chromium_rev': '63439'
+  'chromium_rev': '63722'
 }
 

trunk/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp

@@ -80 +80 @@
     , m_multisampleColorBuffer(0)
     , m_boundFBO(0)
+    , m_boundTexture(0)
+    , m_copyTextureToParentTextureFBO(0)
 #ifdef FLIP_FRAMEBUFFER_VERTICALLY
     , m_scanline(0)
@@ -104 +106 @@
         }
         glDeleteTextures(1, &m_texture);
+        glDeleteFramebuffersEXT(1, &m_copyTextureToParentTextureFBO);
 #ifdef FLIP_FRAMEBUFFER_VERTICALLY
         if (m_scanline)
@@ -173 +176 @@
         return false;
     }
+
+    glGenFramebuffersEXT(1, &m_copyTextureToParentTextureFBO);
 
     m_initialized = true;
@@ -561 +566 @@
 bool WebGraphicsContext3DDefaultImpl::supportsCopyTextureToParentTextureCHROMIUM()
 {
-    // We don't claim support for this extension at this time
-    return false;
+    // This extension requires this desktopGL-only function (GLES2 doesn't
+    // support it), so check for its existence here.
+    return glGetTexLevelParameteriv;
 }
 
 void WebGraphicsContext3DDefaultImpl::copyTextureToParentTextureCHROMIUM(unsigned id, unsigned id2)
 {
+    makeContextCurrent();
+    glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_copyTextureToParentTextureFBO);
+    glFramebufferTexture2DEXT(GL_FRAMEBUFFER,
+                              GL_COLOR_ATTACHMENT0,
+                              GL_TEXTURE_2D,
+                              id,
+                              0); // level
+    glBindTexture(GL_TEXTURE_2D, id2);
+    GLsizei width, height;
+    glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
+    glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_HEIGHT, &height);
+    glCopyTexImage2D(GL_TEXTURE_2D,
+                     0, // level
+                     GL_RGBA,
+                     0, 0, // x, y
+                     width,
+                     height,
+                     0); // border
+    glBindTexture(GL_TEXTURE_2D, m_boundTexture);
+    glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_boundFBO);
 }
 
@@ -691 +717 @@
 DELEGATE_TO_GL_2(bindRenderbuffer, BindRenderbufferEXT, unsigned long, WebGLId)
 
-DELEGATE_TO_GL_2(bindTexture, BindTexture, unsigned long, WebGLId)
+void WebGraphicsContext3DDefaultImpl::bindTexture(unsigned long target, WebGLId texture)
+{
+    makeContextCurrent();
+    glBindTexture(target, texture);
+    m_boundTexture = texture;
+}
 
 DELEGATE_TO_GL_4(blendColor, BlendColor, double, double, double, double)

trunk/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.h

@@ -289 +289 @@
     unsigned int m_boundFBO;
 
+    // For tracking which texture is bound
+    unsigned int m_boundTexture;
+    
+    // FBO used for copying child texture to parent texture.
+    unsigned m_copyTextureToParentTextureFBO;
+
 #ifdef FLIP_FRAMEBUFFER_VERTICALLY
     unsigned char* m_scanline;

trunk/WebKit/chromium/src/WebViewImpl.cpp

@@ -2524 +2524 @@
             GraphicsContext3D::Attributes attributes;
             m_temporaryOnscreenGraphicsContext3D = GraphicsContext3D::create(GraphicsContext3D::Attributes(), m_page->chrome(), GraphicsContext3D::RenderDirectlyToHostWindow);
-#if OS(DARWIN)
             if (m_temporaryOnscreenGraphicsContext3D)
                 m_temporaryOnscreenGraphicsContext3D->reshape(std::max(1, m_size.width), std::max(1, m_size.height));
-#endif
             context = m_temporaryOnscreenGraphicsContext3D.get();
         }