Remove StreamTextureManager

gpu/command_buffer/service/texture_manager_unittest.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/memory/scoped_ptr.h"
 #include "gpu/command_buffer/service/error_state_mock.h"
 #include "gpu/command_buffer/service/feature_info.h"
 #include "gpu/command_buffer/service/framebuffer_manager.h"
@@ skipping 451 matching lines @@
 TEST_F(TextureTest, SetTargetTextureExternalOES) {
   Texture* texture = texture_ref_->texture();
   manager_->SetTarget(texture_ref_.get(), GL_TEXTURE_EXTERNAL_OES);
   EXPECT_FALSE(TextureTestHelper::IsTextureComplete(texture));
   EXPECT_FALSE(TextureTestHelper::IsCubeComplete(texture));
   EXPECT_FALSE(manager_->CanGenerateMipmaps(texture_ref_.get()));
   EXPECT_TRUE(TextureTestHelper::IsNPOT(texture));
   EXPECT_FALSE(manager_->CanRender(texture_ref_.get()));
   EXPECT_TRUE(texture->SafeToRenderFrom());
   EXPECT_TRUE(texture->IsImmutable());
-  manager_->SetStreamTexture(texture_ref_.get(), true);
+  manager_->SetLevelInfo(texture_ref_.get(),
+                         GL_TEXTURE_EXTERNAL_OES,
+                         0,
+                         GL_RGBA,
+                         0,
+                         0,
+                         1,
+                         0,
+                         GL_RGBA,
+                         GL_UNSIGNED_BYTE,
+                         true);
+  manager_->SetLevelImage(texture_ref_.get(),
+                          GL_TEXTURE_EXTERNAL_OES,
+                          0,
+                          gfx::GLImage::CreateGLImage(0).get());
   EXPECT_TRUE(manager_->CanRender(texture_ref_.get()));
+  EXPECT_TRUE(texture->IsImmutable());
 }
 
 TEST_F(TextureTest, ZeroSizeCanNotRender) {
   manager_->SetTarget(texture_ref_.get(), GL_TEXTURE_2D);
   EXPECT_FALSE(manager_->CanRender(texture_ref_.get()));
   manager_->SetLevelInfo(texture_ref_.get(),
                          GL_TEXTURE_2D,
                          0,
                          GL_RGBA,
                          1,
@@ skipping 1511 matching lines @@
 
   // See if we can clear the previously uncleared level now.
   EXPECT_EQ(level0,
             GetLevelInfo(restored_texture.get(), GL_TEXTURE_RECTANGLE_ARB, 0));
   EXPECT_CALL(*decoder_, ClearLevel(_, _, _, _, _, _, _, _, _))
       .WillRepeatedly(Return(true));
   EXPECT_TRUE(manager_->ClearTextureLevel(
       decoder_.get(), restored_texture.get(), GL_TEXTURE_RECTANGLE_ARB, 0));
 }
 
-TEST_F(ProduceConsumeTextureTest, ProduceConsumeStreamTexture) {
-  manager_->SetTarget(texture_ref_.get(), GL_TEXTURE_EXTERNAL_OES);
-  Texture* texture = texture_ref_->texture();
-  EXPECT_EQ(static_cast<GLenum>(GL_TEXTURE_EXTERNAL_OES), texture->target());
-  manager_->SetStreamTexture(texture_ref_.get(), true);
-  GLuint service_id = texture->service_id();
-  Texture* produced_texture = Produce(texture_ref_.get());
-  EXPECT_TRUE(texture->IsStreamTexture());
-
-  GLuint client_id = texture2_->client_id();
-  manager_->RemoveTexture(client_id);
-  Consume(client_id, produced_texture);
-  scoped_refptr<TextureRef> restored_texture = manager_->GetTexture(client_id);
-  EXPECT_EQ(produced_texture, restored_texture->texture());
-  EXPECT_TRUE(restored_texture->texture()->IsStreamTexture());
-  EXPECT_TRUE(restored_texture->texture()->IsImmutable());
-  EXPECT_EQ(service_id, restored_texture->service_id());
-}

[piman, 2013/08/12 23:22:07]

We should keep a test that we can Produce/Consume a texture bound to a GLImage.

[no sievers, 2013/08/13 00:21:35]

Done.

-
 TEST_F(ProduceConsumeTextureTest, ProduceConsumeCube) {
   manager_->SetTarget(texture_ref_.get(), GL_TEXTURE_CUBE_MAP);
   Texture* texture = texture_ref_->texture();
   EXPECT_EQ(static_cast<GLenum>(GL_TEXTURE_CUBE_MAP), texture->target());
   LevelInfo face0(GL_TEXTURE_CUBE_MAP_POSITIVE_X,
                   GL_RGBA,
                   1,
                   1,
                   1,
                   0,
@@ skipping 310 matching lines @@
       .Times(1)
       .RetiresOnSaturation();
   ref2 = NULL;
   texture_manager2_->RemoveTexture(20);
   EXPECT_EQ(initial_memory2,
             memory_tracker2_->GetSize(MemoryTracker::kUnmanaged));
 }
 
 }  // namespace gles2
 }  // namespace gpu