Making use of bindless variants mailbox produce/consume on remainders.

cc/output/gl_renderer.cc

 // Copyright 2010 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 "cc/output/gl_renderer.h"
 
 #include <algorithm>
 #include <limits>
 #include <set>
 #include <string>
@@ skipping 2347 matching lines @@
   gfx::Rect window_rect = MoveFromDrawToWindowSpace(rect);
   DCHECK_GE(window_rect.x(), 0);
   DCHECK_GE(window_rect.y(), 0);
   DCHECK_LE(window_rect.right(), current_surface_size_.width());
   DCHECK_LE(window_rect.bottom(), current_surface_size_.height());
 
   if (!request->force_bitmap_result()) {
     bool own_mailbox = !request->has_texture_mailbox();
 
     GLuint texture_id = 0;
-    gl_->GenTextures(1, &texture_id);
-
     gpu::Mailbox mailbox;
     if (own_mailbox) {
       GLC(gl_, gl_->GenMailboxCHROMIUM(mailbox.name));
-    } else {
-      mailbox = request->texture_mailbox().mailbox();
-      DCHECK_EQ(static_cast<unsigned>(GL_TEXTURE_2D),
-                request->texture_mailbox().target());
-      DCHECK(!mailbox.IsZero());
-      unsigned incoming_sync_point = request->texture_mailbox().sync_point();
-      if (incoming_sync_point)
-        GLC(gl_, gl_->WaitSyncPointCHROMIUM(incoming_sync_point));
-    }
+      gl_->GenTextures(1, &texture_id);
+      GLC(gl_, gl_->BindTexture(GL_TEXTURE_2D, texture_id));
 
-    GLC(gl_, gl_->BindTexture(GL_TEXTURE_2D, texture_id));
-    if (own_mailbox) {
       GLC(gl_,
           gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR));
       GLC(gl_,
           gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR));
       GLC(gl_,
           gl_->TexParameteri(
               GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE));
       GLC(gl_,
           gl_->TexParameteri(
               GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE));
       GLC(gl_, gl_->ProduceTextureCHROMIUM(GL_TEXTURE_2D, mailbox.name));
     } else {
-      GLC(gl_, gl_->ConsumeTextureCHROMIUM(GL_TEXTURE_2D, mailbox.name));
+      mailbox = request->texture_mailbox().mailbox();
+      DCHECK_EQ(static_cast<unsigned>(GL_TEXTURE_2D),
+                request->texture_mailbox().target());
+      DCHECK(!mailbox.IsZero());
+      unsigned incoming_sync_point = request->texture_mailbox().sync_point();
+      if (incoming_sync_point)
+        GLC(gl_, gl_->WaitSyncPointCHROMIUM(incoming_sync_point));
+
+      texture_id = GLC(
+          gl_,
+          gl_->CreateAndConsumeTextureCHROMIUM(GL_TEXTURE_2D, mailbox.name));
     }
     GetFramebufferTexture(texture_id, RGBA_8888, window_rect);
-    GLC(gl_, gl_->BindTexture(GL_TEXTURE_2D, 0));
 
     unsigned sync_point = gl_->InsertSyncPointCHROMIUM();
     TextureMailbox texture_mailbox(mailbox, GL_TEXTURE_2D, sync_point);
 
     scoped_ptr<SingleReleaseCallback> release_callback;
     if (own_mailbox) {
+      GLC(gl_, gl_->BindTexture(GL_TEXTURE_2D, 0));

[danakj, 2014/07/08 15:51:30]

FWIW GetFramebufferTexture already binds/unbinds, so I'm not sure what to do
with this. It's fine here, or it could move below the produce, or it could go
away, idk, just pointing it out.

[dshwang, 2014/07/08 16:36:16]

GetFramebufferTexture actually call BindTexture(GL_TEXTURE_2D, 0) at the end of
fuction. So it's not really needed now.
So we can remove this line, but someone might be wonder why we don't unbind the
texture against line 2372.

If we move this line above GetFramebufferTexture, it hits perf adversely,
because GetFramebufferTexture bind the texture again.

gles2_helper skipped redundant texture binding, so I remains this line for
readability.

Do you want to remove this line?

[danakj, 2014/07/08 16:40:25]

I like having something here to show it's unbound since we did a bind above, so
let's keep it, i was just thinking aloud.

       release_callback = texture_mailbox_deleter_->GetReleaseCallback(
           output_surface_->context_provider(), texture_id);
     } else {
       gl_->DeleteTextures(1, &texture_id);
     }
 
     request->SendTextureResult(
         window_rect.size(), texture_mailbox, release_callback.Pass());
     return;
   }
@@ skipping 748 matching lines @@
     context_support_->ScheduleOverlayPlane(
         overlay.plane_z_order,
         overlay.transform,
         pending_overlay_resources_.back()->texture_id(),
         overlay.display_rect,
         overlay.uv_rect);
   }
 }
 
 }  // namespace cc