| Index: gpu/command_buffer/client/gles2_implementation_unittest.cc
|
| diff --git a/gpu/command_buffer/client/gles2_implementation_unittest.cc b/gpu/command_buffer/client/gles2_implementation_unittest.cc
|
| index c69886ae50f810ca274d312a4793af899a4e121e..c88ba6426fc3c1d0d983442b10ace166790c49fb 100644
|
| --- a/gpu/command_buffer/client/gles2_implementation_unittest.cc
|
| +++ b/gpu/command_buffer/client/gles2_implementation_unittest.cc
|
| @@ -896,100 +896,6 @@ TEST_F(GLES2ImplementationTest, GetShaderPrecisionFormat) {
|
| EXPECT_EQ(precision4, 7);
|
| }
|
|
|
| -TEST_F(GLES2ImplementationTest, ShaderSource) {
|
| - const uint32 kBucketId = GLES2Implementation::kResultBucketId;
|
| - const GLuint kShaderId = 456;
|
| - const char* kString1 = "foobar";
|
| - const char* kString2 = "barfoo";
|
| - const size_t kString1Size = strlen(kString1) + 1;
|
| - const size_t kString2Size = strlen(kString2) + 1;
|
| - const size_t kHeaderSize = sizeof(GLint) * 3;
|
| - const size_t kSourceSize = kHeaderSize + kString1Size + kString2Size;
|
| - const size_t kPaddedHeaderSize =
|
| - transfer_buffer_->RoundToAlignment(kHeaderSize);
|
| - const size_t kPaddedString1Size =
|
| - transfer_buffer_->RoundToAlignment(kString1Size);
|
| - const size_t kPaddedString2Size =
|
| - transfer_buffer_->RoundToAlignment(kString2Size);
|
| - struct Cmds {
|
| - cmd::SetBucketSize set_bucket_size;
|
| - cmd::SetBucketData set_bucket_header;
|
| - cmd::SetToken set_token1;
|
| - cmd::SetBucketData set_bucket_data1;
|
| - cmd::SetToken set_token2;
|
| - cmd::SetBucketData set_bucket_data2;
|
| - cmd::SetToken set_token3;
|
| - cmds::ShaderSourceBucket shader_source_bucket;
|
| - cmd::SetBucketSize clear_bucket_size;
|
| - };
|
| -
|
| - ExpectedMemoryInfo mem0 = GetExpectedMemory(kPaddedHeaderSize);
|
| - ExpectedMemoryInfo mem1 = GetExpectedMemory(kPaddedString1Size);
|
| - ExpectedMemoryInfo mem2 = GetExpectedMemory(kPaddedString2Size);
|
| -
|
| - Cmds expected;
|
| - expected.set_bucket_size.Init(kBucketId, kSourceSize);
|
| - expected.set_bucket_header.Init(
|
| - kBucketId, 0, kHeaderSize, mem0.id, mem0.offset);
|
| - expected.set_token1.Init(GetNextToken());
|
| - expected.set_bucket_data1.Init(
|
| - kBucketId, kHeaderSize, kString1Size, mem1.id, mem1.offset);
|
| - expected.set_token2.Init(GetNextToken());
|
| - expected.set_bucket_data2.Init(
|
| - kBucketId, kHeaderSize + kString1Size, kString2Size, mem2.id,
|
| - mem2.offset);
|
| - expected.set_token3.Init(GetNextToken());
|
| - expected.shader_source_bucket.Init(kShaderId, kBucketId);
|
| - expected.clear_bucket_size.Init(kBucketId, 0);
|
| - const char* kStrings[] = {
|
| - kString1,
|
| - kString2,
|
| - };
|
| - gl_->ShaderSource(kShaderId, 2, kStrings, NULL);
|
| - EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected)));
|
| -}
|
| -
|
| -TEST_F(GLES2ImplementationTest, ShaderSourceWithLength) {
|
| - const uint32 kBucketId = GLES2Implementation::kResultBucketId;
|
| - const GLuint kShaderId = 456;
|
| - const char* kString = "foobar******";
|
| - const size_t kStringSize = 6; // We only need "foobar".
|
| - const size_t kHeaderSize = sizeof(GLint) * 2;
|
| - const size_t kSourceSize = kHeaderSize + kStringSize + 1;
|
| - const size_t kPaddedHeaderSize =
|
| - transfer_buffer_->RoundToAlignment(kHeaderSize);
|
| - const size_t kPaddedStringSize =
|
| - transfer_buffer_->RoundToAlignment(kStringSize + 1);
|
| -
|
| - struct Cmds {
|
| - cmd::SetBucketSize set_bucket_size;
|
| - cmd::SetBucketData set_bucket_header;
|
| - cmd::SetToken set_token1;
|
| - cmd::SetBucketData set_bucket_data;
|
| - cmd::SetToken set_token2;
|
| - cmds::ShaderSourceBucket shader_source_bucket;
|
| - cmd::SetBucketSize clear_bucket_size;
|
| - };
|
| -
|
| - ExpectedMemoryInfo mem0 = GetExpectedMemory(kPaddedHeaderSize);
|
| - ExpectedMemoryInfo mem1 = GetExpectedMemory(kPaddedStringSize);
|
| -
|
| - Cmds expected;
|
| - expected.set_bucket_size.Init(kBucketId, kSourceSize);
|
| - expected.set_bucket_header.Init(
|
| - kBucketId, 0, kHeaderSize, mem0.id, mem0.offset);
|
| - expected.set_token1.Init(GetNextToken());
|
| - expected.set_bucket_data.Init(
|
| - kBucketId, kHeaderSize, kStringSize + 1, mem1.id, mem1.offset);
|
| - expected.set_token2.Init(GetNextToken());
|
| - expected.shader_source_bucket.Init(kShaderId, kBucketId);
|
| - expected.clear_bucket_size.Init(kBucketId, 0);
|
| - const char* kStrings[] = { kString };
|
| - const GLint kLength[] = { kStringSize };
|
| - gl_->ShaderSource(kShaderId, 1, kStrings, kLength);
|
| - EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected)));
|
| -}
|
| -
|
| TEST_F(GLES2ImplementationTest, GetShaderSource) {
|
| const uint32 kBucketId = GLES2Implementation::kResultBucketId;
|
| const GLuint kShaderId = 456;
|
|
|