Changeset 70717 in webkit


Ignore:
Timestamp:
Oct 27, 2010 2:53:07 PM (13 years ago)
Author:
kbr@google.com
Message:

2010-10-27 Kenneth Russell <kbr@google.com>

Reviewed by Dimitri Glazkov.

[chromium] WebGL does not work with the compositor in test_shell
https://bugs.webkit.org/show_bug.cgi?id=48470

  • src/WebGraphicsContext3DDefaultImpl.cpp: (WebKit::WebGraphicsContext3DDefaultImpl::resolveMultisampledFramebuffer):
    • Properly restore the draw framebuffer after resolving.

(WebKit::WebGraphicsContext3DDefaultImpl::prepareTexture):

  • Make the context current before calling resolveMultisampledFramebuffer.
Location:
trunk/WebKit/chromium
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKit/chromium/ChangeLog

    r70713 r70717  
     12010-10-27  Kenneth Russell  <kbr@google.com>
     2
     3        Reviewed by Dimitri Glazkov.
     4
     5        [chromium] WebGL does not work with the compositor in test_shell
     6        https://bugs.webkit.org/show_bug.cgi?id=48470
     7
     8        * src/WebGraphicsContext3DDefaultImpl.cpp:
     9        (WebKit::WebGraphicsContext3DDefaultImpl::resolveMultisampledFramebuffer):
     10         - Properly restore the draw framebuffer after resolving.
     11        (WebKit::WebGraphicsContext3DDefaultImpl::prepareTexture):
     12         - Make the context current before calling resolveMultisampledFramebuffer.
     13
    1142010-10-27  Stuart Morgan  <stuartmorgan@chromium.org>
    215
  • trunk/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp

    r70666 r70717  
    220220{
    221221    if (m_attributes.antialias) {
    222         bool mustRestoreFBO = (m_boundFBO != m_multisampleFBO);
    223222        glBindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT, m_multisampleFBO);
    224223        glBindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, m_fbo);
    225224        glBlitFramebufferEXT(x, y, x + width, y + height, x, y, x + width, y + height, GL_COLOR_BUFFER_BIT, GL_LINEAR);
    226         if (mustRestoreFBO)
    227             glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_boundFBO);
     225        glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_boundFBO);
    228226    }
    229227}
     
    289287    if (!m_renderDirectlyToWebView) {
    290288        // We need to prepare our rendering results for the compositor.
     289        makeContextCurrent();
    291290        resolveMultisampledFramebuffer(0, 0, m_cachedWidth, m_cachedHeight);
    292291    }
Note: See TracChangeset for help on using the changeset viewer.