Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(50)

Unified Diff: gpu/command_buffer/service/texture_manager_unittest.cc

Issue 14828011: Mark zero dimension textures as unrenderable (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/command_buffer/service/texture_manager.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/texture_manager_unittest.cc
diff --git a/gpu/command_buffer/service/texture_manager_unittest.cc b/gpu/command_buffer/service/texture_manager_unittest.cc
index bef870bf137f9a2ac192c1f7efaf39aae50c5706..5cf868372d0506de8b0d55015d581f897df073d9 100644
--- a/gpu/command_buffer/service/texture_manager_unittest.cc
+++ b/gpu/command_buffer/service/texture_manager_unittest.cc
@@ -484,10 +484,23 @@ TEST_F(TextureTest, SetTargetTextureExternalOES) {
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) {
@@ -1485,7 +1498,7 @@ TEST_F(SaveRestoreTextureTest, SaveRestoreClearRectangle) {
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());
« no previous file with comments | « gpu/command_buffer/service/texture_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698