Set attachment for bound framebuffer in FramebufferTextureLayer

gpu/command_buffer/service/gles2_cmd_decoder.cc

 // Copyright (c) 2012 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 "gpu/command_buffer/service/gles2_cmd_decoder.h"
 
 #include <stdio.h>
 
 #include <algorithm>
 #include <cmath>
@@ skipping 6427 matching lines @@
 
   if (texture_ref)
     DoDidUseTexImageIfNeeded(texture_ref->texture(), textarget);
 
   OnFboChanged();
 }
 
 void GLES2DecoderImpl::DoFramebufferTextureLayer(
     GLenum target, GLenum attachment, GLuint client_texture_id,
     GLint level, GLint layer) {
   // TODO(zmo): Unsafe ES3 API, missing states update.

[Zhenyao Mo, 2015/10/26 21:50:33]

Now this is no longer valid with the changes here, but please add a TODO for
"adding full validation"

[qiankun, 2015/10/27 14:26:31]

Done.

   GLuint service_id = 0;
   TextureRef* texture_ref = NULL;
+  Framebuffer* framebuffer = GetFramebufferInfoForTarget(target);
+  if (!framebuffer) {
+    LOCAL_SET_GL_ERROR(
+        GL_INVALID_OPERATION,
+        "glFramebufferTextureLayer", "no framebuffer bound.");
+    return;
+  }
   if (client_texture_id) {
     texture_ref = GetTexture(client_texture_id);
     if (!texture_ref) {
       LOCAL_SET_GL_ERROR(
           GL_INVALID_OPERATION,
           "glFramebufferTextureLayer", "unknown texture_ref");
       return;
     }
     service_id = texture_ref->service_id();
   }
   glFramebufferTextureLayer(target, attachment, service_id, level, layer);
+  GLenum error = LOCAL_PEEK_GL_ERROR("glFramebufferTextureLayer");

[Zhenyao Mo, 2015/10/26 21:50:33]

This is incorrect.  You need to check error before the GL call to make sure no
error from previous GL calls leak into here. See
LOCAL_COPY_REAL_GL_ERRORS_TO_WRAPPER

[qiankun, 2015/10/27 14:26:31]

Done.

+  if (error == GL_NO_ERROR) {
+    framebuffer->AttachTexture(attachment, texture_ref,

[Zhenyao Mo, 2015/10/26 21:50:33]

You should add a AttachTextureLayer function and use it here.  Use AttachTexture
is just wrong.

[qiankun, 2015/10/27 14:26:31]

Framebuffer::AttachTextureLayer is added. What API should I implement for
TextureAttachment?

+        texture_ref->texture()->target(), level, 0);
+  }
 }
 
 void GLES2DecoderImpl::DoGetFramebufferAttachmentParameteriv(
     GLenum target, GLenum attachment, GLenum pname, GLint* params) {
   const char kFunctionName[] = "glGetFramebufferAttachmentParameteriv";
   Framebuffer* framebuffer = GetFramebufferInfoForTarget(target);
   if (!framebuffer) {
     if (!unsafe_es3_apis_enabled()) {
       LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, kFunctionName,
           "no framebuffer bound");
@@ skipping 8630 matching lines @@
   return error::kNoError;
 }
 
 // Include the auto-generated part of this file. We split this because it means
 // we can easily edit the non-auto generated parts right here in this file
 // instead of having to edit some template or the code generator.
 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu