WebGL: add targets for WebGL 2 when check FBO targets

Source/core/html/canvas/WebGLRenderingContextBase.cpp

 /*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 1347 matching lines @@
 
 void WebGLRenderingContextBase::bufferSubData(GLenum target, long long offset, DOMArrayBufferView* data)
 {
     if (isContextLost())
         return;
     if (!data)
         return;
     bufferSubDataImpl(target, offset, data->byteLength(), data->baseAddress());
 }
 
+bool WebGLRenderingContextBase::validateFramebufferTarget(GLenum target)
+{
+    if (target == GL_FRAMEBUFFER)
+        return true;
+    return false;
+}
+
+
 GLenum WebGLRenderingContextBase::checkFramebufferStatus(GLenum target)
 {
     if (isContextLost())
         return GL_FRAMEBUFFER_UNSUPPORTED;
-    if (target != GL_FRAMEBUFFER) {
+    if (!validateFramebufferTarget(target)) {
         synthesizeGLError(GL_INVALID_ENUM, "checkFramebufferStatus", "invalid target");
         return 0;
     }
     if (!m_framebufferBinding || !m_framebufferBinding->object())

[Ken Russell (switch to Gerrit), 2015/04/28 05:18:59]

Looking at this again, it occurs to me that this code won't work properly if
GL_READ_FRAMEBUFFER is passed since the draw and read framebuffers are different
binding points. Making this change without fixing up all of the code in
WebGLRenderingContextBase that accesses m_framebufferBinding makes the code less
correct rather than more correct. A better approach would be to also add a
protected virtual method like "getFramebufferBinding" which is overridden in
WebGL2RenderingContextBase, instead of WebGLRenderingContextBase accessing
m_framebufferBinding directly. Please do this.

[yunchao, 2015/04/29 07:43:22]

Agree. I add a function getFramebufferBinding() to get the 'correct' framebuffer
bound to given target.

         return GL_FRAMEBUFFER_COMPLETE;
     const char* reason = "framebuffer incomplete";
     GLenum result = m_framebufferBinding->checkStatus(&reason);
     if (result != GL_FRAMEBUFFER_COMPLETE) {
         emitGLWarning("checkFramebufferStatus", reason);
         return result;
     }
     result = webContext()->checkFramebufferStatus(target);
     return result;
 }
@@ skipping 3980 matching lines @@
 
 void WebGLRenderingContextBase::printWarningToConsole(const String& message)
 {
     if (!canvas())
         return;
     canvas()->document().addConsoleMessage(ConsoleMessage::create(RenderingMessageSource, WarningMessageLevel, message));
 }
 
 bool WebGLRenderingContextBase::validateFramebufferFuncParameters(const char* functionName, GLenum target, GLenum attachment)
 {
-    if (target != GL_FRAMEBUFFER) {
+    if (!validateFramebufferTarget(target)) {
         synthesizeGLError(GL_INVALID_ENUM, functionName, "invalid target");
         return false;
     }
     switch (attachment) {
     case GL_COLOR_ATTACHMENT0:
     case GL_DEPTH_ATTACHMENT:
     case GL_STENCIL_ATTACHMENT:
     case GC3D_DEPTH_STENCIL_ATTACHMENT_WEBGL:
         break;
     default:
@@ skipping 705 matching lines @@
     return m_sharedWebGraphicsContext3D ? m_sharedWebGraphicsContext3D->drawingBuffer() : 0;
 }
 #else
 DrawingBuffer* WebGLRenderingContextBase::drawingBuffer() const
 {
     return m_drawingBuffer.get();
 }
 #endif
 
 } // namespace blink