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 1351 matching lines @@
         return;
     if (!data)
         return;
     bufferSubDataImpl(target, offset, data->byteLength(), data->baseAddress());
 }
 
 GLenum WebGLRenderingContextBase::checkFramebufferStatus(GLenum target)
 {
     if (isContextLost())
         return GL_FRAMEBUFFER_UNSUPPORTED;
-    if (target != GL_FRAMEBUFFER) {
+    if (!((isWebGL2OrHigher() && (target == GL_READ_FRAMEBUFFER || target == GL_DRAW_FRAMEBUFFER)) || target == GL_FRAMEBUFFER)) {

[Ken Russell (switch to Gerrit), 2015/04/23 17:54:31]

These nested expressions are unreadable. Please factor them out into a
validateFramebufferTarget method (similar to validateBufferTarget) and override
it in WebGL2RenderingContextBase to add the new targets.

[yunchao, 2015/04/24 07:07:34]

Agree. It is much clear. In fact, I also thought about adding a function to
validate the targets, but the functions is too simple...

         synthesizeGLError(GL_INVALID_ENUM, "checkFramebufferStatus", "invalid target");
         return 0;
     }
     if (!m_framebufferBinding || !m_framebufferBinding->object())
         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;
@@ skipping 3984 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 (!((isWebGL2OrHigher() && (target == GL_READ_FRAMEBUFFER || target == GL_DRAW_FRAMEBUFFER)) || target == GL_FRAMEBUFFER)) {
         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