Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

gpu/command_buffer/service/mailbox_manager_sync.cc

 // Copyright 2014 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/mailbox_manager_sync.h"
 
 #include <algorithm>
 #include <queue>
 
 #include "base/memory/linked_ptr.h"
 #include "base/synchronization/lock.h"
 #include "gpu/command_buffer/service/texture_manager.h"
 #include "ui/gl/gl_fence.h"
 #include "ui/gl/gl_implementation.h"
 
 #if !defined(OS_MACOSX)
 #include "ui/gl/gl_fence_egl.h"
 #endif
 
 namespace gpu {
 namespace gles2 {
 
 namespace {
 
+bool SkipTextureWorkarounds(const Texture* texture) {
+  // TODO(sievers): crbug.com/352274
+  // Should probably only fail if it already *has* mipmaps, while allowing
+  // incomplete textures here.
+  bool needs_mips =
+      texture->min_filter() != GL_NEAREST && texture->min_filter() != GL_LINEAR;
+  if (texture->target() != GL_TEXTURE_2D || needs_mips || !texture->IsDefined())
+    return true;
+
+  return false;
+}
+
 base::LazyInstance<base::Lock> g_lock = LAZY_INSTANCE_INITIALIZER;
 
 typedef std::map<uint32, linked_ptr<gfx::GLFence>> SyncPointToFenceMap;
 base::LazyInstance<SyncPointToFenceMap> g_sync_point_to_fence =
     LAZY_INSTANCE_INITIALIZER;
 #if !defined(OS_MACOSX)
 base::LazyInstance<std::queue<SyncPointToFenceMap::iterator>> g_sync_points =
     LAZY_INSTANCE_INITIALIZER;
 #endif
 
@@ skipping 142 matching lines @@
 MailboxManagerSync::TextureGroupRef::~TextureGroupRef() {
 }
 
 MailboxManagerSync::MailboxManagerSync() {
 }
 
 MailboxManagerSync::~MailboxManagerSync() {
   DCHECK_EQ(0U, texture_to_group_.size());
 }
 
-// static
-bool MailboxManagerSync::SkipTextureWorkarounds(const Texture* texture) {
-  // Cannot support mips due to support mismatch between
-  // EGL_KHR_gl_texture_2D_image and glEGLImageTargetTexture2DOES for
-  // texture levels.
-  bool has_mips = texture->NeedsMips() && texture->texture_complete();
-  return texture->target() != GL_TEXTURE_2D || has_mips;
-}
-
 bool MailboxManagerSync::UsesSync() {
   return true;
 }
 
 Texture* MailboxManagerSync::ConsumeTexture(const Mailbox& mailbox) {
   base::AutoLock lock(g_lock.Get());
   TextureGroup* group = TextureGroup::FromName(mailbox);
   if (!group)
     return NULL;
 
@@ skipping 78 matching lines @@
 
   // Make sure we don't clobber with an older version
   if (!definition.IsOlderThan(group_ref->version))
     return;
 
   // Also don't push redundant updates. Note that it would break the
   // versioning.
   if (definition.Matches(texture))
     return;
 
-  DCHECK_IMPLIES(gl_image, image_buffer.get());
   if (gl_image && !image_buffer->IsClient(gl_image)) {
     LOG(ERROR) << "MailboxSync: Incompatible attachment";
     return;
   }
 
   group->SetDefinition(TextureDefinition(texture, ++group_ref->version,
                                          gl_image ? image_buffer : NULL));
 }
 
 void MailboxManagerSync::PushTextureUpdates(uint32 sync_point) {
@@ skipping 18 matching lines @@
     if (texture_version == definition.version() ||
         definition.IsOlderThan(texture_version))
       continue;
     texture_version = definition.version();
     definition.UpdateTexture(texture);
   }
 }
 
 }  // namespace gles2
 }  // namespace gpu