Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(651)

Unified Diff: Source/core/html/canvas/WebGL2RenderingContextBase.cpp

Issue 1120953002: WebGL 2: add read/write framebuffer binding points to related APIs (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: addressed zmo@'s and kbr@'s feedback Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/html/canvas/WebGL2RenderingContextBase.cpp
diff --git a/Source/core/html/canvas/WebGL2RenderingContextBase.cpp b/Source/core/html/canvas/WebGL2RenderingContextBase.cpp
index 96dacb33e080e01e8533be0d9772957caf3b7d4a..54a5fac0352fb7edf2069998a15585e736c745a9 100644
--- a/Source/core/html/canvas/WebGL2RenderingContextBase.cpp
+++ b/Source/core/html/canvas/WebGL2RenderingContextBase.cpp
@@ -1559,6 +1559,31 @@ void WebGL2RenderingContextBase::bindFramebuffer(GLenum target, WebGLFramebuffer
setFramebuffer(target, buffer);
}
+void WebGL2RenderingContextBase::deleteFramebuffer(WebGLFramebuffer* framebuffer)
+{
+ if (!deleteObject(framebuffer))
+ return;
+ GLenum target = 0;
+ if (framebuffer == m_framebufferBinding) {
+ if (framebuffer == m_readFramebufferBinding) {
+ target = GL_FRAMEBUFFER;
+ m_framebufferBinding = nullptr;
+ m_readFramebufferBinding = nullptr;
+ } else {
+ target = GL_DRAW_FRAMEBUFFER;
+ m_framebufferBinding = nullptr;
+ }
+ } else if (framebuffer == m_readFramebufferBinding) {
+ target = GL_READ_FRAMEBUFFER;
Zhenyao Mo 2015/06/09 20:29:50 As I mentioned in another place, no need for drawi
yunchao 2015/06/10 08:21:24 seems that there is no problem.
+ m_readFramebufferBinding = nullptr;
+ }
+ if (target) {
+ drawingBuffer()->setFramebufferBinding(target, 0);
+ // Have to call drawingBuffer()->bind() here to bind back to internal fbo.
+ drawingBuffer()->bind(target);
+ }
+}
+
ScriptValue WebGL2RenderingContextBase::getParameter(ScriptState* scriptState, GLenum pname)
{
if (isContextLost())
@@ -2082,4 +2107,19 @@ void WebGL2RenderingContextBase::removeBoundBuffer(WebGLBuffer* buffer)
WebGLRenderingContextBase::removeBoundBuffer(buffer);
}
+void WebGL2RenderingContextBase::restoreCurrentFramebuffer()
+{
+ bindFramebuffer(GL_DRAW_FRAMEBUFFER, m_framebufferBinding.get());
+ bindFramebuffer(GL_READ_FRAMEBUFFER, m_readFramebufferBinding.get());
+}
+
+GLenum WebGL2RenderingContextBase::boundFramebufferColorFormat()
+{
+ if (m_readFramebufferBinding && m_readFramebufferBinding->object())
+ return m_readFramebufferBinding->colorBufferFormat();
+ if (m_requestedAttributes.alpha())
+ return GL_RGBA;
+ return GL_RGB;
+}
+
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698