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

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

Issue 289993002: Remove shm versions of immediate commands from command buffer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@functions-with-extension-flag
Patch Set: try to avoid compiler warning on buffer overflow and template specialization linker problem with tw… Created 6 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
Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest_attribs.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_attribs.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_attribs.cc
index cf3ecd0f19de7a00cce2fae3ce6b9c7b264301d9..022c94b9c7a2b8a693166bbee449c567df3997e7 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_attribs.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_attribs.cc
@@ -260,25 +260,6 @@ class GLES2DecoderVertexArraysOESTest : public GLES2DecoderWithShaderTest {
GLES2DecoderWithShaderTest::TearDown();
}
- void GenVertexArraysOESValidArgs() {
- AddExpectationsForGenVertexArraysOES();
- GetSharedMemoryAs<GLuint*>()[0] = kNewClientId;
- GenVertexArraysOES cmd;
- cmd.Init(1, shared_memory_id_, shared_memory_offset_);
- EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
- EXPECT_EQ(GL_NO_ERROR, GetGLError());
- EXPECT_TRUE(GetVertexArrayInfo(kNewClientId) != NULL);
- AddExpectationsForDeleteVertexArraysOES();
- }
-
- void GenVertexArraysOESInvalidArgs() {
- EXPECT_CALL(*gl_, GenVertexArraysOES(_, _)).Times(0);
- GetSharedMemoryAs<GLuint*>()[0] = client_vertexarray_id_;
- GenVertexArraysOES cmd;
- cmd.Init(1, shared_memory_id_, shared_memory_offset_);
- EXPECT_EQ(error::kInvalidArguments, ExecuteCmd(cmd));
- }
-
void GenVertexArraysOESImmediateValidArgs() {
AddExpectationsForGenVertexArraysOES();
GenVertexArraysOESImmediate* cmd =
@@ -300,24 +281,6 @@ class GLES2DecoderVertexArraysOESTest : public GLES2DecoderWithShaderTest {
ExecuteImmediateCmd(*cmd, sizeof(&client_vertexarray_id_)));
}
- void DeleteVertexArraysOESValidArgs() {
- AddExpectationsForDeleteVertexArraysOES();
- GetSharedMemoryAs<GLuint*>()[0] = client_vertexarray_id_;
- DeleteVertexArraysOES cmd;
- cmd.Init(1, shared_memory_id_, shared_memory_offset_);
- EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
- EXPECT_EQ(GL_NO_ERROR, GetGLError());
- EXPECT_TRUE(GetVertexArrayInfo(client_vertexarray_id_) == NULL);
- vertex_array_deleted_manually_ = true;
- }
-
- void DeleteVertexArraysOESInvalidArgs() {
- GetSharedMemoryAs<GLuint*>()[0] = kInvalidClientId;
- DeleteVertexArraysOES cmd;
- cmd.Init(1, shared_memory_id_, shared_memory_offset_);
- EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
- }
-
void DeleteVertexArraysOESImmediateValidArgs() {
AddExpectationsForDeleteVertexArraysOES();
DeleteVertexArraysOESImmediate& cmd =
@@ -413,20 +376,6 @@ INSTANTIATE_TEST_CASE_P(Service,
::testing::Bool());
// Test vertex array objects with native support
-TEST_P(GLES2DecoderVertexArraysOESTest, GenVertexArraysOESValidArgs) {
- GenVertexArraysOESValidArgs();
-}
-TEST_P(GLES2DecoderEmulatedVertexArraysOESTest, GenVertexArraysOESValidArgs) {
- GenVertexArraysOESValidArgs();
-}
-
-TEST_P(GLES2DecoderVertexArraysOESTest, GenVertexArraysOESInvalidArgs) {
- GenVertexArraysOESInvalidArgs();
-}
-TEST_P(GLES2DecoderEmulatedVertexArraysOESTest, ) {
- GenVertexArraysOESInvalidArgs();
-}
-
TEST_P(GLES2DecoderVertexArraysOESTest, GenVertexArraysOESImmediateValidArgs) {
GenVertexArraysOESImmediateValidArgs();
}
@@ -444,22 +393,6 @@ TEST_P(GLES2DecoderEmulatedVertexArraysOESTest,
GenVertexArraysOESImmediateInvalidArgs();
}
-TEST_P(GLES2DecoderVertexArraysOESTest, DeleteVertexArraysOESValidArgs) {
- DeleteVertexArraysOESValidArgs();
-}
-TEST_P(GLES2DecoderEmulatedVertexArraysOESTest,
- DeleteVertexArraysOESValidArgs) {
- DeleteVertexArraysOESValidArgs();
-}
-
-TEST_P(GLES2DecoderVertexArraysOESTest, DeleteVertexArraysOESInvalidArgs) {
- DeleteVertexArraysOESInvalidArgs();
-}
-TEST_P(GLES2DecoderEmulatedVertexArraysOESTest,
- DeleteVertexArraysOESInvalidArgs) {
- DeleteVertexArraysOESInvalidArgs();
-}
-
TEST_P(GLES2DecoderVertexArraysOESTest,
DeleteVertexArraysOESImmediateValidArgs) {
DeleteVertexArraysOESImmediateValidArgs();

Powered by Google App Engine
This is Rietveld 408576698