Android: Always update SurfaceTexture when used for draw

content/common/gpu/stream_texture_android.cc

 // Copyright (c) 2013 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 "content/common/gpu/stream_texture_android.h"
 
 #include "base/bind.h"
 #include "content/common/android/surface_texture_peer.h"
 #include "content/common/gpu/gpu_channel.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "gpu/command_buffer/service/context_group.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 #include "gpu/command_buffer/service/texture_manager.h"
 #include "ui/gfx/size.h"
+#include "ui/gl/scoped_make_current.h"
 
 namespace content {
 
 using gpu::gles2::ContextGroup;
 using gpu::gles2::GLES2Decoder;
 using gpu::gles2::TextureManager;
 using gpu::gles2::TextureRef;
 
 // static
 int32 StreamTexture::Create(
@@ skipping 33 matching lines @@
   }
 
   return 0;
 }
 
 StreamTexture::StreamTexture(GpuCommandBufferStub* owner_stub,
                              int32 route_id,
                              uint32 texture_id)
     : surface_texture_(new gfx::SurfaceTexture(texture_id)),
       size_(0, 0),
-      has_updated_(false),
+      has_valid_frame_(false),
+      has_pending_frame_(false),
       owner_stub_(owner_stub),
       route_id_(route_id),
       has_listener_(false),
       weak_factory_(this) {
   owner_stub->AddDestructionObserver(this);
   memset(current_matrix_, 0, sizeof(current_matrix_));
   owner_stub->channel()->AddRoute(route_id, this);
 }
 
 StreamTexture::~StreamTexture() {
@@ skipping 14 matching lines @@
 }
 
 void StreamTexture::Destroy() {
   NOTREACHED();
 }
 
 void StreamTexture::WillUseTexImage() {
   if (!owner_stub_)
     return;
 
-  // TODO(sievers): Update also when used in a different context.
-  //                Also see crbug.com/309162.
-  if (surface_texture_.get() &&
-      owner_stub_->decoder()->GetGLContext()->IsCurrent(NULL)) {
+  if (surface_texture_.get() && has_pending_frame_) {
+    scoped_ptr<ui::ScopedMakeCurrent> scoped_make_current;
+    bool needs_make_current =
+        owner_stub_->decoder()->GetGLContext()->IsCurrent(NULL);
+    // On Android we should not have to perform a real context switch here when
+    // using virtual contexts.
+    DCHECK(!needs_make_current || !owner_stub_->decoder()
+                                       ->GetContextGroup()
+                                       ->feature_info()
+                                       ->workarounds()
+                                       .use_virtualized_gl_contexts);
+    if (needs_make_current) {
+      scoped_make_current.reset(new ui::ScopedMakeCurrent(
+          owner_stub_->decoder()->GetGLContext(), owner_stub_->surface()));
+    }
     surface_texture_->UpdateTexImage();
+    has_valid_frame_ = true;
+    has_pending_frame_ = false;

[no sievers, 2014/01/28 00:03:08]

Argh, there is a problem.

UpdateTexImage() has the side-effect of calling glBindTexImage(). So I guess if
I switched the context here, I have to restore the binding.

Also, while I don't have to do anything when this gets called from
PrepareTexturesForRender(), I do have to restore the binding here for the
glCopyTextureCHROMIUM() call site, which I can't differentiate from here.

   }
 
-  if (has_listener_) {
+  if (has_listener_ && has_valid_frame_) {
     float mtx[16];
     surface_texture_->GetTransformMatrix(mtx);
 
     // Only query the matrix once we have bound a valid frame.
-    if (has_updated_ && memcmp(current_matrix_, mtx, sizeof(mtx)) != 0) {
+    if (memcmp(current_matrix_, mtx, sizeof(mtx)) != 0) {
       memcpy(current_matrix_, mtx, sizeof(mtx));
 
       GpuStreamTextureMsg_MatrixChanged_Params params;
       memcpy(&params.m00, mtx, sizeof(mtx));
       owner_stub_->channel()->Send(
           new GpuStreamTextureMsg_MatrixChanged(route_id_, params));
     }
   }
 }
 
 void StreamTexture::OnFrameAvailable() {
-  has_updated_ = true;
+  has_pending_frame_ = true;
   DCHECK(has_listener_);
   if (owner_stub_) {
     owner_stub_->channel()->Send(
         new GpuStreamTextureMsg_FrameAvailable(route_id_));
   }
 }
 
 gfx::Size StreamTexture::GetSize() {
   return size_;
 }
@@ skipping 22 matching lines @@
   if (!owner_stub_)
     return;
 
   base::ProcessHandle process = owner_stub_->channel()->renderer_pid();
 
   SurfaceTexturePeer::GetInstance()->EstablishSurfaceTexturePeer(
       process, surface_texture_, primary_id, secondary_id);
 }
 
 }  // namespace content