Mark zero dimension textures as unrenderable

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/gles2_cmd_decoder_mock.h"
@@ skipping 466 matching lines @@
   EXPECT_FALSE(manager_->CanRender(texture_));
   EXPECT_TRUE(texture_->SafeToRenderFrom());
   EXPECT_FALSE(texture_->IsImmutable());
 }
 
 TEST_F(TextureTest, SetTargetTextureExternalOES) {
   manager_->SetTarget(texture_, GL_TEXTURE_EXTERNAL_OES);
   EXPECT_FALSE(TextureTestHelper::IsTextureComplete(texture_));
   EXPECT_FALSE(TextureTestHelper::IsCubeComplete(texture_));
   EXPECT_FALSE(manager_->CanGenerateMipmaps(texture_));
-  EXPECT_FALSE(TextureTestHelper::IsNPOT(texture_));
-  EXPECT_TRUE(manager_->CanRender(texture_));
+  EXPECT_TRUE(TextureTestHelper::IsNPOT(texture_));
+  EXPECT_FALSE(manager_->CanRender(texture_));
   EXPECT_TRUE(texture_->SafeToRenderFrom());
   EXPECT_TRUE(texture_->IsImmutable());
+  manager_->SetStreamTexture(texture_, true);
+  EXPECT_TRUE(manager_->CanRender(texture_));
+}
+
+TEST_F(TextureTest, ZeroSizeCanNotRender) {
+  manager_->SetTarget(texture_, GL_TEXTURE_2D);
+  EXPECT_FALSE(manager_->CanRender(texture_));
+  manager_->SetLevelInfo(texture_,
+      GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, true);
+  EXPECT_TRUE(manager_->CanRender(texture_));
+  manager_->SetLevelInfo(texture_,
+      GL_TEXTURE_2D, 0, GL_RGBA, 0, 0, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, true);
+  EXPECT_FALSE(manager_->CanRender(texture_));
 }
 
 TEST_F(TextureTest, EstimatedSize) {
   manager_->SetTarget(texture_, GL_TEXTURE_2D);
   manager_->SetLevelInfo(texture_,
       GL_TEXTURE_2D, 0, GL_RGBA, 8, 4, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, true);
   EXPECT_EQ(8u * 4u * 4u, texture_->estimated_size());
   manager_->SetLevelInfo(texture_,
       GL_TEXTURE_2D, 2, GL_RGBA, 8, 4, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, true);
   EXPECT_EQ(8u * 4u * 4u * 2u, texture_->estimated_size());
@@ skipping 977 matching lines @@
   EXPECT_EQ(level0, GetLevelInfo(texture2_.get(), GL_TEXTURE_RECTANGLE_ARB, 0));
   EXPECT_CALL(*decoder_, ClearLevel(_, _, _, _, _, _, _, _, _))
       .WillRepeatedly(Return(true));
   EXPECT_TRUE(manager_->ClearTextureLevel(
       decoder_.get(), texture2_, GL_TEXTURE_RECTANGLE_ARB, 0));
 }
 
 TEST_F(SaveRestoreTextureTest, SaveRestoreStreamTexture) {
   manager_->SetTarget(texture_, GL_TEXTURE_EXTERNAL_OES);
   EXPECT_EQ(static_cast<GLenum>(GL_TEXTURE_EXTERNAL_OES), texture_->target());
-  texture_->SetStreamTexture(true);
+  manager_->SetStreamTexture(texture_, true);
   GLuint service_id = texture_->service_id();
   scoped_ptr<TextureDefinition> definition(Save(texture_));
   EXPECT_FALSE(texture_->IsStreamTexture());
   manager_->SetTarget(texture2_, GL_TEXTURE_EXTERNAL_OES);
   Restore(texture2_, definition.release());
   EXPECT_TRUE(texture2_->IsStreamTexture());
   EXPECT_TRUE(texture2_->IsImmutable());
   EXPECT_EQ(service_id, texture2_->service_id());
 }
 
@@ skipping 28 matching lines @@
   EXPECT_EQ(face0,
             GetLevelInfo(texture2_.get(), GL_TEXTURE_CUBE_MAP_POSITIVE_X, 0));
   EXPECT_EQ(face5,
             GetLevelInfo(texture2_.get(), GL_TEXTURE_CUBE_MAP_NEGATIVE_Z, 0));
 }
 
 }  // namespace gles2
 }  // namespace gpu