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

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

Issue 12494005: Use client side arrays for GL_STREAM_DRAW attributes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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
Index: gpu/command_buffer/service/vertex_attrib_manager_unittest.cc
diff --git a/gpu/command_buffer/service/vertex_attrib_manager_unittest.cc b/gpu/command_buffer/service/vertex_attrib_manager_unittest.cc
index 3ce938ce4c75f3eff2c5b51a2763eb7c1c5c6711..71a694c22384dccacef450a5b13a13411ce92ea5 100644
--- a/gpu/command_buffer/service/vertex_attrib_manager_unittest.cc
+++ b/gpu/command_buffer/service/vertex_attrib_manager_unittest.cc
@@ -7,6 +7,7 @@
#include "base/memory/scoped_ptr.h"
#include "gpu/command_buffer/service/buffer_manager.h"
#include "gpu/command_buffer/service/feature_info.h"
+#include "gpu/command_buffer/service/gles2_cmd_decoder_mock.h"
#include "gpu/command_buffer/service/test_helper.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/gl/gl_mock.h"
@@ -109,7 +110,7 @@ TEST_F(VertexAttribManagerTest, Enable) {
}
TEST_F(VertexAttribManagerTest, SetAttribInfo) {
- BufferManager buffer_manager(NULL);
+ BufferManager buffer_manager(NULL, NULL);
buffer_manager.CreateBuffer(1, 2);
Buffer* buffer = buffer_manager.GetBuffer(1);
ASSERT_TRUE(buffer != NULL);
@@ -145,7 +146,8 @@ TEST_F(VertexAttribManagerTest, HaveFixedAttribs) {
}
TEST_F(VertexAttribManagerTest, CanAccess) {
- BufferManager buffer_manager(NULL);
+ MockGLES2Decoder decoder;
+ BufferManager buffer_manager(NULL, NULL);
buffer_manager.CreateBuffer(1, 2);
Buffer* buffer = buffer_manager.GetBuffer(1);
ASSERT_TRUE(buffer != NULL);
@@ -161,17 +163,23 @@ TEST_F(VertexAttribManagerTest, CanAccess) {
EXPECT_FALSE(info->CanAccess(0));
EXPECT_TRUE(buffer_manager.SetTarget(buffer, GL_ARRAY_BUFFER));
- buffer_manager.SetInfo(buffer, 15, GL_STATIC_DRAW);
+ TestHelper::DoBufferData(
+ gl_.get(), &decoder, &buffer_manager, buffer, 15, GL_STATIC_DRAW, NULL,
+ GL_NO_ERROR);
EXPECT_FALSE(info->CanAccess(0));
- buffer_manager.SetInfo(buffer, 16, GL_STATIC_DRAW);
+ TestHelper::DoBufferData(
+ gl_.get(), &decoder, &buffer_manager, buffer, 16, GL_STATIC_DRAW, NULL,
+ GL_NO_ERROR);
EXPECT_TRUE(info->CanAccess(0));
EXPECT_FALSE(info->CanAccess(1));
manager_->SetAttribInfo(1, buffer, 4, GL_FLOAT, GL_FALSE, 0, 16, 1);
EXPECT_FALSE(info->CanAccess(0));
- buffer_manager.SetInfo(buffer, 32, GL_STATIC_DRAW);
+ TestHelper::DoBufferData(
+ gl_.get(), &decoder, &buffer_manager, buffer, 32, GL_STATIC_DRAW, NULL,
+ GL_NO_ERROR);
EXPECT_TRUE(info->CanAccess(0));
EXPECT_FALSE(info->CanAccess(1));
manager_->SetAttribInfo(1, buffer, 4, GL_FLOAT, GL_FALSE, 0, 16, 0);
@@ -187,7 +195,7 @@ TEST_F(VertexAttribManagerTest, CanAccess) {
}
TEST_F(VertexAttribManagerTest, Unbind) {
- BufferManager buffer_manager(NULL);
+ BufferManager buffer_manager(NULL, NULL);
buffer_manager.CreateBuffer(1, 2);
buffer_manager.CreateBuffer(3, 4);
Buffer* buffer1 = buffer_manager.GetBuffer(1);
@@ -223,6 +231,9 @@ TEST_F(VertexAttribManagerTest, Unbind) {
buffer_manager.Destroy(false);
}
+// TODO(gman): Test ValidateBindings
+// TODO(gman): Test ValidateBindings with client side arrays.
+
} // namespace gles2
} // namespace gpu
« no previous file with comments | « gpu/command_buffer/service/vertex_attrib_manager.cc ('k') | gpu/command_buffer/tests/gl_stream_draw_unittests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698