Set attachment for bound framebuffer in FramebufferTextureLayer

third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "modules/webgl/WebGL2RenderingContextBase.h"
 
 #include "bindings/modules/v8/WebGLAny.h"
 #include "core/html/HTMLCanvasElement.h"
 #include "core/html/HTMLImageElement.h"
@@ skipping 130 matching lines @@
     m_boundTransformFeedbackBuffer = nullptr;
     m_boundUniformBuffer = nullptr;
 
     m_currentBooleanOcclusionQuery = nullptr;
     m_currentTransformFeedbackPrimitivesWrittenQuery = nullptr;
 
     m_max3DTextureSize = 0;
     webContext()->getIntegerv(GL_MAX_3D_TEXTURE_SIZE, &m_max3DTextureSize);
     m_max3DTextureLevel = WebGLTexture::computeLevelCount(m_max3DTextureSize, m_max3DTextureSize, m_max3DTextureSize);
 
+    m_maxArrayTextureLayers = 0;
+    webContext()->getIntegerv(GL_MAX_ARRAY_TEXTURE_LAYERS, &m_maxArrayTextureLayers);
+
     GLint numCombinedTextureImageUnits = 0;
     webContext()->getIntegerv(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, &numCombinedTextureImageUnits);
     m_samplerUnits.clear();
     m_samplerUnits.resize(numCombinedTextureImageUnits);
 
     GLint maxTransformFeedbackSeparateAttribs = 0;
     webContext()->getIntegerv(GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS, &maxTransformFeedbackSeparateAttribs);
     m_boundIndexedTransformFeedbackBuffers.clear();
     m_boundIndexedTransformFeedbackBuffers.resize(maxTransformFeedbackSeparateAttribs);
 
@@ skipping 75 matching lines @@
 }
 
 void WebGL2RenderingContextBase::blitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
 {
     if (isContextLost())
         return;
 
     webContext()->blitFramebufferCHROMIUM(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
 }
 
-void WebGL2RenderingContextBase::framebufferTextureLayer(GLenum target, GLenum attachment, const WebGLTexture* texture, GLint level, GLint layer)
+bool WebGL2RenderingContextBase::validateTextureLayer(const char* functionName, GLenum target, GLint layer)

[Zhenyao Mo, 2015/10/27 21:21:31]

Function name maybe validateTexFuncLayer()? to be consistent with
validateTexFuncLevel().
It's better to use texTarget instead of target, less confusing.

[qiankun, 2015/10/27 23:25:27]

Ok, I will fix this.

[qiankun, 2015/10/27 23:55:59]

Done.

 {
-    if (isContextLost())
+    if (layer < 0) {
+        synthesizeGLError(GL_INVALID_VALUE, functionName, "layer out of range");
+        return false;
+    }
+    switch (target) {
+    case GL_TEXTURE_3D:
+        if (layer > m_max3DTextureSize - 1) {
+            synthesizeGLError(GL_INVALID_VALUE, functionName, "layer out of range");
+            return false;
+        }
+        break;
+    case GL_TEXTURE_2D_ARRAY:
+        if (layer > m_maxArrayTextureLayers - 1) {
+            synthesizeGLError(GL_INVALID_VALUE, functionName, "layer out of range");
+            return false;
+        }
+        break;
+    default:
+        ASSERT_NOT_REACHED();
+        return false;
+    }
+    return true;
+}
+
+void WebGL2RenderingContextBase::framebufferTextureLayer(ScriptState* scriptState, GLenum target, GLenum attachment, WebGLTexture* texture, GLint level, GLint layer)
+{
+    if (isContextLost() || !validateFramebufferFuncParameters("framebufferTextureLayer", target, attachment))
         return;
-
     if (texture && !texture->validate(contextGroup(), this)) {
         synthesizeGLError(GL_INVALID_VALUE, "framebufferTextureLayer", "no texture or texture not from this context");
         return;
     }
+    GLenum textarget = texture ? texture->getTarget() : 0;
+    if (texture) {
+        if (!validateTextureLayer("framebufferTextureLayer", textarget, layer))
+            return;
+        if (textarget != GL_TEXTURE_3D && textarget != GL_TEXTURE_2D_ARRAY) {
+            synthesizeGLError(GL_INVALID_VALUE, "framebufferTextureLayer", "invalid texture target");

[Zhenyao Mo, 2015/10/27 21:21:31]

This should be INVALID_OPERATION.
Message should be "invalid texture type".

[qiankun, 2015/10/27 23:25:27]

I will fix this.

[qiankun, 2015/10/27 23:55:59]

Done.

+            return;
+        }
+        if (!validateTexFuncLevel("framebufferTextureLayer", textarget, level))

[Zhenyao Mo, 2015/10/27 21:21:31]

You need to update validateTexFuncLevel() (in turn 
WebGLRenderingContextBase::getMaxTextureLevelForTarget) to handle 3D textures.

[qiankun, 2015/10/27 23:25:27]

WebGL2RenderingContextBase::getMaxTextureLevelForTarget is already existed to
handle 3D textures.

[Zhenyao Mo, 2015/10/27 23:40:28]

You are right.  Code search points me to the WebGL 1 version, and I didn't
realize it's been overloaded in WebGL 2.

+            return;
+    }
 
+    WebGLFramebuffer* framebufferBinding = getFramebufferBinding(target);
+    if (!framebufferBinding || !framebufferBinding->object()) {
+        synthesizeGLError(GL_INVALID_OPERATION, "framebufferTextureLayer", "no framebuffer bound");
+        return;
+    }
     webContext()->framebufferTextureLayer(target, attachment, objectOrZero(texture), level, layer);
+    framebufferBinding->setAttachmentForBoundFramebuffer(target, attachment, textarget, texture, level, layer);
+    applyStencilTest();
+    preserveObjectWrapper(scriptState, framebufferBinding, "attachment", attachment, texture);
 }
 
 ScriptValue WebGL2RenderingContextBase::getInternalformatParameter(ScriptState* scriptState, GLenum target, GLenum internalformat, GLenum pname)
 {
     if (isContextLost())
         return ScriptValue::createNull(scriptState);
 
     if (target != GL_RENDERBUFFER) {
         synthesizeGLError(GL_INVALID_ENUM, "getInternalformatParameter", "invalid target");
         return ScriptValue::createNull(scriptState);
@@ skipping 2556 matching lines @@
         tex = m_textureUnits[m_activeTextureUnit].m_texture3DBinding.get();
         if (!tex)
             synthesizeGLError(GL_INVALID_OPERATION, functionName, "no texture bound to GL_TEXTURE_3D");
         break;
     default:
         return WebGLRenderingContextBase::validateTextureBinding(functionName, target, useSixEnumsForCubeMap);
     }
     return tex;
 }
 
 GLint WebGL2RenderingContextBase::getMaxTextureLevelForTarget(GLenum target)

[qiankun, 2015/10/27 23:25:27]

It overrides the implementation in WebGLRenderingContextBase to handle 3D
texture.

 {
     switch (target) {
     case GL_TEXTURE_3D:
         return m_max3DTextureLevel;
     case GL_TEXTURE_2D_ARRAY:
         return m_maxTextureLevel;
     }
     return WebGLRenderingContextBase::getMaxTextureLevelForTarget(target);
 }
 
@@ skipping 118 matching lines @@
 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