Bug 87032 - Restore WebGL's framebuffer binding after DrawingBuffer's prepareBackBuffer()
Summary: Restore WebGL's framebuffer binding after DrawingBuffer's prepareBackBuffer()
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebGL (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Zhenyao Mo
Depends on:
Reported: 2012-05-21 11:19 PDT by Zhenyao Mo
Modified: 2012-05-21 14:00 PDT (History)
6 users (show)

See Also:

Patch (1.25 KB, patch)
2012-05-21 11:39 PDT, Zhenyao Mo
no flags Details | Formatted Diff | Diff
Patch (1.47 KB, patch)
2012-05-21 13:04 PDT, Zhenyao Mo
jamesr: review+
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Zhenyao Mo 2012-05-21 11:19:42 PDT
This is regressed again.  Last time I added restoreFramebufferBinding(), now this function is no longer called anywhere, and apparently that caused the binding to be lost.
Comment 1 Zhenyao Mo 2012-05-21 11:39:24 PDT
Created attachment 143066 [details]
Comment 2 Zhenyao Mo 2012-05-21 11:40:25 PDT
Please review.  Once this lands and webkit rolls, I'll make sure to enable related webgl conformance tests in chromium immediately.
Comment 3 James Robinson 2012-05-21 11:48:08 PDT
Comment on attachment 143066 [details]

View in context: https://bugs.webkit.org/attachment.cgi?id=143066&action=review

> Source/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp:138
>      if (multisample())
>          bind();
> +
> +    restoreFramebufferBinding();

Something here is clearly wrong.  line 136 is binding m_multisampleFBO ? m_multisampleFBO : m_fbo.  Line 138 is binding m_framebufferBinding.  We should make up our mind and just bind one.
Comment 4 Zhenyao Mo 2012-05-21 13:04:56 PDT
Created attachment 143083 [details]
Comment 5 Zhenyao Mo 2012-05-21 13:05:18 PDT
Revised, please have another look.
Comment 6 James Robinson 2012-05-21 13:16:37 PDT
Comment on attachment 143083 [details]

Thanks, that does look better.
Comment 7 Kenneth Russell 2012-05-21 13:49:33 PDT
Comment on attachment 143083 [details]

Looks fine to me too.
Comment 8 Zhenyao Mo 2012-05-21 14:00:26 PDT
Committed r117814: <http://trac.webkit.org/changeset/117814>