Android: Fix up video to work with mailboxes.

gpu/command_buffer/service/texture_manager.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/texture_manager.h"
 #include "base/bits.h"
 #include "base/stringprintf.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
 #include "gpu/command_buffer/service/feature_info.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
@@ skipping 921 matching lines @@
     ++num_unsafe_textures_;
   }
 }
 
 TextureDefinition* TextureManager::Save(Texture* texture) {
   DCHECK(texture->owned_);
 
   if (texture->IsAttachedToFramebuffer())
     return NULL;
 
+  if (texture->target() == GL_TEXTURE_EXTERNAL_OES &&
+      !texture->IsStreamTexture())
+    return NULL;
+
   TextureDefinition::LevelInfos level_infos(texture->level_infos_.size());
   for (size_t face = 0; face < level_infos.size(); ++face) {
     GLenum target =
         texture->target() == GL_TEXTURE_CUBE_MAP ? FaceIndexToGLTarget(face)
                                                  : texture->target();
     for (GLint level = 0; level <= texture->max_level_set_; ++level) {
       const Texture::LevelInfo& level_info =
           texture->level_infos_[face][level];
 
       level_infos[face].push_back(
@@ skipping 54 matching lines @@
 
   if (texture->target() != definition->target())
     return false;
 
   if (texture->level_infos_.size() < definition->level_infos().size())
     return false;
 
   if (texture->level_infos_[0].size() < definition->level_infos()[0].size())
     return false;
 
+  if (texture->target() == GL_TEXTURE_EXTERNAL_OES) {
+    if (definition->wrap_t() != GL_CLAMP_TO_EDGE ||
+        definition->wrap_s() != GL_CLAMP_TO_EDGE ||
+        definition->min_filter() != GL_LINEAR) {

[piman, 2013/04/13 17:11:36]

Is this needed? We checked texture->target() == definition->target() above, and
I assume the original texture originally ensured this when it was constructed as
a GL_TEXTURE_EXTERNAL_OES (note: the spec allows both GL_NEAREST or GL_LINEAR
for the min filter).

[no sievers, 2013/04/15 17:33:44]

True, removed. This validation does not add any value.

I've also passed the stream boolean through to the TextureDefinition. And also
have it reset after Produce(), since the two things it affects (saying that a
texture can be updated from the stream, and that if the client texture is
deleted first, the stream object needs to be deleted too) don't apply anymore
after a new empty GL texture was created.

+      return false;
+    }
+    texture->SetStreamTexture(true);
+  }
+
   for (size_t face = 0; face < definition->level_infos().size(); ++face) {
     GLenum target =
         texture->target() == GL_TEXTURE_CUBE_MAP ? FaceIndexToGLTarget(face)
                                                  : texture->target();
     GLint new_max_level = definition->level_infos()[face].size() - 1;
     for (GLint level = 0;
          level <= std::max(texture->max_level_set_, new_max_level);
          ++level) {
       const TextureDefinition::LevelInfo& level_info =
           level <= new_max_level ? definition->level_infos()[face][level]
@@ skipping 207 matching lines @@
 void TextureManager::AddToSignature(
     Texture* texture,
     GLenum target,
     GLint level,
     std::string* signature) const {
   texture->AddToSignature(feature_info_.get(), target, level, signature);
 }
 
 }  // namespace gles2
 }  // namespace gpu