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

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

Issue 12017032: Add calls to EnsureGPUMemoryAvailable into GLES2DecoderImpl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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/renderbuffer_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/renderbuffer_manager_unittest.cc
diff --git a/gpu/command_buffer/service/renderbuffer_manager_unittest.cc b/gpu/command_buffer/service/renderbuffer_manager_unittest.cc
index dba97dcff98af3125dd7cf09dd6d75461cb7e356..7ae90b10b91d62f150608d2176df4b5b27e4f2aa 100644
--- a/gpu/command_buffer/service/renderbuffer_manager_unittest.cc
+++ b/gpu/command_buffer/service/renderbuffer_manager_unittest.cc
@@ -148,7 +148,7 @@ TEST_F(RenderbufferManagerTest, RenderbufferInfo) {
EXPECT_FALSE(info1->cleared());
EXPECT_FALSE(info1->IsDeleted());
EXPECT_TRUE(manager_->HaveUnclearedRenderbuffers());
- EXPECT_EQ(kWidth * kHeight * 4u * 2u, info1->EstimatedSize());
+ EXPECT_EQ(kWidth * kHeight * 4u * 4u, info1->EstimatedSize());
manager_->SetCleared(info1, true);
EXPECT_TRUE(info1->cleared());
@@ -179,10 +179,12 @@ TEST_F(RenderbufferManagerMemoryTrackerTest, Basic) {
const GLsizei kWidth = 128;
const GLsizei kHeight1 = 64;
const GLsizei kHeight2 = 32;
- size_t expected_size_1 = kWidth * kHeight1 * kSamples *
- GLES2Util::RenderbufferBytesPerPixel(kFormat);
- size_t expected_size_2 = kWidth * kHeight2 * kSamples *
- GLES2Util::RenderbufferBytesPerPixel(kFormat);
+ uint32 expected_size_1 = 0;
+ uint32 expected_size_2 = 0;
+ RenderbufferManager::ComputeEstimatedRenderbufferSize(
+ kWidth, kHeight1, kSamples, kFormat, &expected_size_1);
+ RenderbufferManager::ComputeEstimatedRenderbufferSize(
+ kWidth, kHeight2, kSamples, kFormat, &expected_size_2);
EXPECT_MEMORY_ALLOCATION_CHANGE(
0, expected_size_1, MemoryTracker::kUnmanaged);
manager_->SetInfo(info1, kSamples, kFormat, kWidth, kHeight1);
« no previous file with comments | « gpu/command_buffer/service/renderbuffer_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698