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

Unified Diff: gpu/command_buffer/client/buffer_tracker_unittest.cc

Issue 706173005: Enable asynchronous glReadPixels on Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add mechanism to propagate service-side glMapBuffer errors + tests. Created 6 years, 1 month 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
Index: gpu/command_buffer/client/buffer_tracker_unittest.cc
diff --git a/gpu/command_buffer/client/buffer_tracker_unittest.cc b/gpu/command_buffer/client/buffer_tracker_unittest.cc
index a92839613407075a6d7498f88eb50145cd628c84..783c6659d5249ba27a4a25c9a3f0380dcb6f82d1 100644
--- a/gpu/command_buffer/client/buffer_tracker_unittest.cc
+++ b/gpu/command_buffer/client/buffer_tracker_unittest.cc
@@ -79,14 +79,21 @@ TEST_F(BufferTrackerTest, Basic) {
const GLuint kId1 = 123;
const GLuint kId2 = 124;
const GLsizeiptr size = 64;
+ const GLsizeiptr metadata_size = 4;
// Check we can create a Buffer.
- BufferTracker::Buffer* buffer = buffer_tracker_->CreateBuffer(kId1, size);
+ BufferTracker::Buffer* buffer =
+ buffer_tracker_->CreateBuffer(kId1, size, metadata_size);
ASSERT_TRUE(buffer != NULL);
// Check we can get the same Buffer.
EXPECT_EQ(buffer, buffer_tracker_->GetBuffer(kId1));
// Check mapped memory address.
EXPECT_TRUE(buffer->address() != NULL);
+ EXPECT_EQ(size, buffer->size());
+ // Check mapped memory address for the metadata.
+ EXPECT_EQ(static_cast<uint8_t*>(buffer->address()) + size,
+ static_cast<uint8_t*>(buffer->metadata_address()));
+ EXPECT_EQ(metadata_size, buffer->metadata_size());
// Check shared memory was allocated.
EXPECT_EQ(1lu, mapped_memory_->num_chunks());
// Check we get nothing for a non-existent buffer.
@@ -104,7 +111,7 @@ TEST_F(BufferTrackerTest, ZeroSize) {
const GLuint kId = 123;
// Check we can create a Buffer with zero size.
- BufferTracker::Buffer* buffer = buffer_tracker_->CreateBuffer(kId, 0);
+ BufferTracker::Buffer* buffer = buffer_tracker_->CreateBuffer(kId, 0, 0);
ASSERT_TRUE(buffer != NULL);
// Check mapped memory address.
EXPECT_TRUE(buffer->address() == NULL);
@@ -120,7 +127,7 @@ TEST_F(BufferTrackerTest, LostContext) {
command_buffer_->set_context_lost(true);
// Check we can create a Buffer when after losing context.
- BufferTracker::Buffer* buffer = buffer_tracker_->CreateBuffer(kId, size);
+ BufferTracker::Buffer* buffer = buffer_tracker_->CreateBuffer(kId, size, 0);
ASSERT_TRUE(buffer != NULL);
// Check mapped memory address.
EXPECT_EQ(64u, buffer->size());
@@ -136,7 +143,7 @@ TEST_F(BufferTrackerTest, Unmanage) {
const GLuint kId = 123;
const GLsizeiptr size = 64;
- BufferTracker::Buffer* buffer = buffer_tracker_->CreateBuffer(kId, size);
+ BufferTracker::Buffer* buffer = buffer_tracker_->CreateBuffer(kId, size, 0);
ASSERT_TRUE(buffer != NULL);
EXPECT_EQ(mapped_memory_->bytes_in_use(), static_cast<size_t>(size));

Powered by Google App Engine
This is Rietveld 408576698