Chromium Code Reviews Chromium Code Reviews
Issue 8566059:
Add CommandBuffer::SetGetBuffer (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src| 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 dc2f4197587765605fb604d3b8fdf5c66b074c61..472c91ce476c14d8246770e6d39f30217b9c87a5 100644 |
| --- a/gpu/command_buffer/client/gles2_implementation_unittest.cc |
| +++ b/gpu/command_buffer/client/gles2_implementation_unittest.cc |
| @@ -19,30 +19,17 @@ namespace gpu { |
| class GLES2MockCommandBufferHelper : public CommandBuffer { |
| public: |
| - static const int32 kTransferBufferId = 0x123; |
| + static const int32 kTransferBufferBaseId = 0x123; |
| + static const int32 kMaxTransferBuffers = 6; |
| GLES2MockCommandBufferHelper() { } |
| virtual ~GLES2MockCommandBufferHelper() { } |
| // CommandBuffer implementation: |
| - virtual bool Initialize(int32 size) { |
| - ring_buffer_.reset(new CommandBufferEntry[size]); |
| - ring_buffer_buffer_.ptr = ring_buffer_.get(); |
| - ring_buffer_buffer_.size = size; |
| - state_.num_entries = size / sizeof(ring_buffer_[0]); |
| - state_.token = 10000; // All token checks in the tests should pass. |
| + virtual bool Initialize() { |
| return true; |
| } |
| - virtual bool Initialize(base::SharedMemory* buffer, int32 size) { |
| - GPU_NOTREACHED(); |
| - return false; |
| - } |
| - |
| - virtual Buffer GetRingBuffer() { |
| - return ring_buffer_buffer_; |
| - } |
| - |
| virtual State GetState() { |
| return state_; |
| } |
| @@ -58,19 +45,43 @@ class GLES2MockCommandBufferHelper : public CommandBuffer { |
| virtual State FlushSync(int32 put_offset, int32 last_known_get) { |
| state_.put_offset = put_offset; |
| state_.get_offset = put_offset; |
| - OnFlush(transfer_buffer_buffer_.ptr); |
| + // Warning: This is a hack. We just happen to know that the default |
| + // transfer buffer will be the first transfer buffer. |
| + OnFlush(transfer_buffer_buffers_[0].ptr); |
| return state_; |
| } |
| + virtual void SetGetBuffer(int shm_id) { |
| + ring_buffer_buffer_ = GetTransferBuffer(shm_id); |
| + ring_buffer_ = static_cast<CommandBufferEntry*>(ring_buffer_buffer_.ptr); |
| + state_.num_entries = ring_buffer_buffer_.size / sizeof(ring_buffer_[0]); |
| + state_.token = 10000; // All token checks in the tests should pass. |
| + } |
| + |
| virtual void SetGetOffset(int32 get_offset) { |
| state_.get_offset = get_offset; |
| } |
| + // Get's the Id of the next transfer buffer that will be returned |
| + // by CreateTransferBuffer. This is useful for testing expected ids. |
| + int32 GetNextFreeTransferBufferId() { |
| + for (size_t ii = 0; ii < arraysize(transfer_buffers_); ++ii) { |
| + if (!transfer_buffers_[ii].get()) { |
| + return kTransferBufferBaseId + ii; |
| + } |
| + } |
| + return -1; |
| + } |
| + |
| virtual int32 CreateTransferBuffer(size_t size, int32 id_request) { |
| - transfer_buffer_.reset(new int8[size]); |
| - transfer_buffer_buffer_.ptr = transfer_buffer_.get(); |
| - transfer_buffer_buffer_.size = size; |
| - return kTransferBufferId; |
| + int32 id = GetNextFreeTransferBufferId(); |
| + if (id >= 0) { |
| + int32 ndx = id - kTransferBufferBaseId; |
| + transfer_buffers_[ndx].reset(new int8[size]); |
| + transfer_buffer_buffers_[ndx].ptr = transfer_buffers_[ndx].get(); |
| + transfer_buffer_buffers_[ndx].size = size; |
| + } |
| + return id; |
| } |
| virtual void DestroyTransferBuffer(int32 /* id */) { |
| @@ -78,8 +89,9 @@ class GLES2MockCommandBufferHelper : public CommandBuffer { |
| } |
| virtual Buffer GetTransferBuffer(int32 id) { |
| - GPU_DCHECK_EQ(id, kTransferBufferId); |
| - return transfer_buffer_buffer_; |
| + GPU_DCHECK_GE(id, kTransferBufferBaseId); |
| + GPU_DCHECK_LT(id, kTransferBufferBaseId + kMaxTransferBuffers); |
| + return transfer_buffer_buffers_[id - kTransferBufferBaseId]; |
| } |
| virtual int32 RegisterTransferBuffer(base::SharedMemory* shared_memory, |
| @@ -107,9 +119,9 @@ class GLES2MockCommandBufferHelper : public CommandBuffer { |
| virtual void OnFlush(void* transfer_buffer) = 0; |
| private: |
| - scoped_array<int8> transfer_buffer_; |
| - Buffer transfer_buffer_buffer_; |
| - scoped_array<CommandBufferEntry> ring_buffer_; |
| + scoped_array<int8> transfer_buffers_[10]; |
| + Buffer transfer_buffer_buffers_[10]; |
|
Ken Russell (switch to Gerrit)
2011/11/21 18:04:10
Could you #define kMaxTransferBuffers at the top o
|
| + CommandBufferEntry* ring_buffer_; |
| Buffer ring_buffer_buffer_; |
| State state_; |
| }; |
| @@ -126,7 +138,8 @@ class MockGLES2CommandBuffer : public GLES2MockCommandBufferHelper { |
| // GCC requires these declarations, but MSVC requires they not be present |
| #ifndef _MSC_VER |
| -const int32 GLES2MockCommandBufferHelper::kTransferBufferId; |
| +const int32 GLES2MockCommandBufferHelper::kTransferBufferBaseId; |
| +const int32 GLES2MockCommandBufferHelper::kMaxTransferBuffers; |
| #endif |
| namespace gles2 { |
| @@ -195,8 +208,6 @@ class GLES2ImplementationTest : public testing::Test { |
| static const int32 kCommandBufferSizeBytes = |
| kNumCommandEntries * sizeof(CommandBufferEntry); |
| static const size_t kTransferBufferSize = 256; |
| - static const int32 kTransferBufferId = |
| - GLES2MockCommandBufferHelper::kTransferBufferId; |
| static const uint8 kInitialValue = 0xBD; |
| static const GLint kMaxCombinedTextureImageUnits = 8; |
| static const GLint kMaxCubeMapTextureSize = 64; |
| @@ -215,7 +226,8 @@ class GLES2ImplementationTest : public testing::Test { |
| GLES2ImplementationTest() |
| : commands_(NULL), |
| token_(0), |
| - offset_(0) { |
| + offset_(0), |
| + transfer_buffer_id_(-1) { |
| } |
| virtual void SetUp() { |
| @@ -229,11 +241,11 @@ class GLES2ImplementationTest : public testing::Test { |
| offset_ = GLES2Implementation::kStartingOffset; |
| command_buffer_.reset(new MockGLES2CommandBuffer()); |
| - command_buffer_->Initialize(kCommandBufferSizeBytes); |
| + command_buffer_->Initialize(); |
| - EXPECT_EQ(kTransferBufferId, |
| - command_buffer_->CreateTransferBuffer(kTransferBufferSize, -1)); |
| - transfer_buffer_ = command_buffer_->GetTransferBuffer(kTransferBufferId); |
| + transfer_buffer_id_ = |
| + command_buffer_->CreateTransferBuffer(kTransferBufferSize, -1); |
| + transfer_buffer_ = command_buffer_->GetTransferBuffer(transfer_buffer_id_); |
| ClearTransferBuffer(); |
| helper_.reset(new GLES2CmdHelper(command_buffer_.get())); |
| @@ -297,7 +309,7 @@ class GLES2ImplementationTest : public testing::Test { |
| helper_.get(), |
| kTransferBufferSize, |
| transfer_buffer_.ptr, |
| - kTransferBufferId, |
| + transfer_buffer_id_, |
| shared_resources, |
| bind_generates_resource)); |
| } |
| @@ -306,7 +318,7 @@ class GLES2ImplementationTest : public testing::Test { |
| .Times(1) |
| .RetiresOnSaturation(); |
| helper_->CommandBufferHelper::Finish(); |
| - Buffer ring_buffer = command_buffer_->GetRingBuffer(); |
| + Buffer ring_buffer = helper_->get_ring_buffer(); |
| commands_ = static_cast<CommandBufferEntry*>(ring_buffer.ptr) + |
| command_buffer_->GetState().put_offset; |
| ClearCommands(); |
| @@ -321,7 +333,7 @@ class GLES2ImplementationTest : public testing::Test { |
| } |
| void ClearCommands() { |
| - Buffer ring_buffer = command_buffer_->GetRingBuffer(); |
| + Buffer ring_buffer = helper_->get_ring_buffer(); |
| memset(ring_buffer.ptr, kInitialValue, ring_buffer.size); |
| } |
| @@ -362,6 +374,10 @@ class GLES2ImplementationTest : public testing::Test { |
| return static_cast<T*>(GetTransferAddressFromOffset(offset, size)); |
| } |
| + int32 GetNextFreeTransferBufferId() { |
| + return command_buffer_->GetNextFreeTransferBufferId(); |
| + } |
| + |
| Buffer transfer_buffer_; |
| CommandBufferEntry* commands_; |
| scoped_ptr<MockGLES2CommandBuffer> command_buffer_; |
| @@ -370,6 +386,7 @@ class GLES2ImplementationTest : public testing::Test { |
| scoped_ptr<GLES2Implementation> gl_; |
| int token_; |
| uint32 offset_; |
| + int32 transfer_buffer_id_; |
| }; |
| class GLES2ImplementationStrictSharedTest : public GLES2ImplementationTest { |
| @@ -379,11 +396,6 @@ class GLES2ImplementationStrictSharedTest : public GLES2ImplementationTest { |
| } |
| }; |
| -// GCC requires these declarations, but MSVC requires they not be present |
| -#ifndef _MSC_VER |
| -const int32 GLES2ImplementationTest::kTransferBufferId; |
| -#endif |
| - |
| TEST_F(GLES2ImplementationTest, ShaderSource) { |
| const uint32 kBucketId = 1; // This id is hardcoded into GLES2Implemenation |
| const GLuint kShaderId = 456; |
| @@ -410,16 +422,16 @@ TEST_F(GLES2ImplementationTest, ShaderSource) { |
| Cmds expected; |
| expected.set_bucket_size.Init(kBucketId, kSourceSize); |
| expected.set_bucket_data1.Init( |
| - kBucketId, 0, kString1Size, kTransferBufferId, |
| + kBucketId, 0, kString1Size, transfer_buffer_id_, |
| AllocateTransferBuffer(kPaddedString1Size)); |
| expected.set_token1.Init(GetNextToken()); |
| expected.set_bucket_data2.Init( |
| - kBucketId, kString1Size, kString2Size, kTransferBufferId, |
| + kBucketId, kString1Size, kString2Size, transfer_buffer_id_, |
| AllocateTransferBuffer(kPaddedString2Size)); |
| expected.set_token2.Init(GetNextToken()); |
| expected.set_bucket_data3.Init( |
| kBucketId, kString1Size + kString2Size, |
| - kString3Size, kTransferBufferId, |
| + kString3Size, transfer_buffer_id_, |
| AllocateTransferBuffer(kPaddedString3Size)); |
| expected.set_token3.Init(GetNextToken()); |
| expected.shader_source_bucket.Init(kShaderId, kBucketId); |
| @@ -449,9 +461,9 @@ TEST_F(GLES2ImplementationTest, GetShaderSource) { |
| Cmds expected; |
| expected.set_bucket_size1.Init(kBucketId, 0); |
| expected.get_shader_source.Init(kShaderId, kBucketId); |
| - expected.get_bucket_size.Init(kBucketId, kTransferBufferId, 0); |
| + expected.get_bucket_size.Init(kBucketId, transfer_buffer_id_, 0); |
| expected.get_bucket_data.Init( |
| - kBucketId, 0, sizeof(kString), kTransferBufferId, offset); |
| + kBucketId, 0, sizeof(kString), transfer_buffer_id_, offset); |
| expected.set_token1.Init(GetNextToken()); |
| expected.set_bucket_size2.Init(kBucketId, 0); |
| char buf[sizeof(kString) + 1]; |
| @@ -513,13 +525,13 @@ TEST_F(GLES2ImplementationTest, DrawArraysClientSideBuffers) { |
| expected.bind_to_emu.Init(GL_ARRAY_BUFFER, kEmuBufferId); |
| expected.set_size.Init(GL_ARRAY_BUFFER, kTotalSize, 0, 0, GL_DYNAMIC_DRAW); |
| expected.copy_data1.Init( |
| - GL_ARRAY_BUFFER, kEmuOffset1, kSize1, kTransferBufferId, |
| + GL_ARRAY_BUFFER, kEmuOffset1, kSize1, transfer_buffer_id_, |
| AllocateTransferBuffer(kSize1)); |
| expected.set_token1.Init(GetNextToken()); |
| expected.set_pointer1.Init(kAttribIndex1, kNumComponents1, |
| GL_FLOAT, GL_FALSE, 0, kEmuOffset1); |
| expected.copy_data2.Init( |
| - GL_ARRAY_BUFFER, kEmuOffset2, kSize2, kTransferBufferId, |
| + GL_ARRAY_BUFFER, kEmuOffset2, kSize2, transfer_buffer_id_, |
| AllocateTransferBuffer(kSize2)); |
| expected.set_token2.Init(GetNextToken()); |
| expected.set_pointer2.Init(kAttribIndex2, kNumComponents2, |
| @@ -589,19 +601,19 @@ TEST_F(GLES2ImplementationTest, DrawElementsClientSideBuffers) { |
| expected.set_index_size.Init( |
| GL_ELEMENT_ARRAY_BUFFER, kIndexSize, 0, 0, GL_DYNAMIC_DRAW); |
| expected.copy_data0.Init( |
| - GL_ELEMENT_ARRAY_BUFFER, 0, kIndexSize, kTransferBufferId, |
| + GL_ELEMENT_ARRAY_BUFFER, 0, kIndexSize, transfer_buffer_id_, |
| AllocateTransferBuffer(kIndexSize)); |
| expected.set_token0.Init(GetNextToken()); |
| expected.bind_to_emu.Init(GL_ARRAY_BUFFER, kEmuBufferId); |
| expected.set_size.Init(GL_ARRAY_BUFFER, kTotalSize, 0, 0, GL_DYNAMIC_DRAW); |
| expected.copy_data1.Init( |
| - GL_ARRAY_BUFFER, kEmuOffset1, kSize1, kTransferBufferId, |
| + GL_ARRAY_BUFFER, kEmuOffset1, kSize1, transfer_buffer_id_, |
| AllocateTransferBuffer(kSize1)); |
| expected.set_token1.Init(GetNextToken()); |
| expected.set_pointer1.Init(kAttribIndex1, kNumComponents1, |
| GL_FLOAT, GL_FALSE, 0, kEmuOffset1); |
| expected.copy_data2.Init( |
| - GL_ARRAY_BUFFER, kEmuOffset2, kSize2, kTransferBufferId, |
| + GL_ARRAY_BUFFER, kEmuOffset2, kSize2, transfer_buffer_id_, |
| AllocateTransferBuffer(kSize2)); |
| expected.set_token2.Init(GetNextToken()); |
| expected.set_pointer2.Init(kAttribIndex2, kNumComponents2, |
| @@ -665,17 +677,17 @@ TEST_F(GLES2ImplementationTest, |
| expected.enable2.Init(kAttribIndex2); |
| expected.bind_to_index.Init(GL_ELEMENT_ARRAY_BUFFER, kClientIndexBufferId); |
| expected.get_max.Init(kClientIndexBufferId, kCount, GL_UNSIGNED_SHORT, |
| - kIndexOffset, kTransferBufferId, 0); |
| + kIndexOffset, transfer_buffer_id_, 0); |
| expected.bind_to_emu.Init(GL_ARRAY_BUFFER, kEmuBufferId); |
| expected.set_size.Init(GL_ARRAY_BUFFER, kTotalSize, 0, 0, GL_DYNAMIC_DRAW); |
| expected.copy_data1.Init( |
| - GL_ARRAY_BUFFER, kEmuOffset1, kSize1, kTransferBufferId, |
| + GL_ARRAY_BUFFER, kEmuOffset1, kSize1, transfer_buffer_id_, |
| AllocateTransferBuffer(kSize1)); |
| expected.set_token1.Init(GetNextToken()); |
| expected.set_pointer1.Init(kAttribIndex1, kNumComponents1, |
| GL_FLOAT, GL_FALSE, 0, kEmuOffset1); |
| expected.copy_data2.Init( |
| - GL_ARRAY_BUFFER, kEmuOffset2, kSize2, kTransferBufferId, |
| + GL_ARRAY_BUFFER, kEmuOffset2, kSize2, transfer_buffer_id_, |
| AllocateTransferBuffer(kSize2)); |
| expected.set_token2.Init(GetNextToken()); |
| expected.set_pointer2.Init(kAttribIndex2, kNumComponents2, |
| @@ -722,7 +734,7 @@ TEST_F(GLES2ImplementationTest, GetVertexBufferPointerv) { |
| expected.set_pointer.Init(kAttribIndex2, kNumComponents2, GL_FLOAT, GL_FALSE, |
| kStride2, kOffset2); |
| expected.get_pointer.Init(kAttribIndex2, GL_VERTEX_ATTRIB_ARRAY_POINTER, |
| - kTransferBufferId, 0); |
| + transfer_buffer_id_, 0); |
| // One call to flush to way for GetVertexAttribPointerv |
| EXPECT_CALL(*command_buffer_, OnFlush(_)) |
| @@ -779,10 +791,10 @@ TEST_F(GLES2ImplementationTest, GetVertexAttrib) { |
| kStride2, kOffset2); |
| expected.get1.Init(kAttribIndex2, |
| GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING, |
| - kTransferBufferId, 0); |
| + transfer_buffer_id_, 0); |
| expected.get2.Init(kAttribIndex1, |
| GL_CURRENT_VERTEX_ATTRIB, |
| - kTransferBufferId, 0); |
| + transfer_buffer_id_, 0); |
| FourFloats current_attrib(1.2f, 3.4f, 5.6f, 7.8f); |
| @@ -845,7 +857,7 @@ TEST_F(GLES2ImplementationTest, ReservedIds) { |
| GetError get; |
| }; |
| Cmds expected; |
| - expected.get.Init(kTransferBufferId, 0); |
| + expected.get.Init(transfer_buffer_id_, 0); |
| // One call to flush to wait for GetError |
| EXPECT_CALL(*command_buffer_, OnFlush(_)) |
| @@ -883,15 +895,15 @@ TEST_F(GLES2ImplementationTest, ReadPixels2Reads) { |
| Cmds expected; |
| expected.read1.Init( |
| 0, 0, kWidth, kHeight / 2, kFormat, kType, |
| - kTransferBufferId, |
| + transfer_buffer_id_, |
| AllocateTransferBuffer(kWidth * kHeight / 2 * kBytesPerPixel), |
| - kTransferBufferId, 0); |
| + transfer_buffer_id_, 0); |
| expected.set_token1.Init(GetNextToken()); |
| expected.read2.Init( |
| 0, kHeight / 2, kWidth, kHeight / 2, kFormat, kType, |
| - kTransferBufferId, |
| + transfer_buffer_id_, |
| AllocateTransferBuffer(kWidth * kHeight / 2 * kBytesPerPixel), |
| - kTransferBufferId, 0); |
| + transfer_buffer_id_, 0); |
| expected.set_token2.Init(GetNextToken()); |
| scoped_array<int8> buffer(new int8[kWidth * kHeight * kBytesPerPixel]); |
| @@ -918,9 +930,9 @@ TEST_F(GLES2ImplementationTest, ReadPixelsBadFormatType) { |
| Cmds expected; |
| expected.read.Init( |
| 0, 0, kWidth, kHeight / 2, kFormat, kType, |
| - kTransferBufferId, |
| + transfer_buffer_id_, |
| AllocateTransferBuffer(kWidth * kHeight * kBytesPerPixel), |
| - kTransferBufferId, 0); |
| + transfer_buffer_id_, 0); |
| expected.set_token.Init(GetNextToken()); |
| scoped_array<int8> buffer(new int8[kWidth * kHeight * kBytesPerPixel]); |
| @@ -943,7 +955,7 @@ TEST_F(GLES2ImplementationTest, FreeUnusedSharedMemory) { |
| uint32 offset = 0; |
| Cmds expected; |
| expected.buf.Init( |
| - kTarget, kOffset, kSize, kTransferBufferId, offset); |
| + kTarget, kOffset, kSize, transfer_buffer_id_, offset); |
| expected.set_token.Init(GetNextToken()); |
| void* mem = gl_->MapBufferSubDataCHROMIUM( |
| @@ -968,7 +980,7 @@ TEST_F(GLES2ImplementationTest, MapUnmapBufferSubDataCHROMIUM) { |
| uint32 offset = 0; |
| Cmds expected; |
| expected.buf.Init( |
| - kTarget, kOffset, kSize, kTransferBufferId, offset); |
| + kTarget, kOffset, kSize, GetNextFreeTransferBufferId(), offset); |
| expected.set_token.Init(GetNextToken()); |
| void* mem = gl_->MapBufferSubDataCHROMIUM( |
| @@ -1023,7 +1035,7 @@ TEST_F(GLES2ImplementationTest, MapUnmapTexSubImage2DCHROMIUM) { |
| Cmds expected; |
| expected.tex.Init( |
| GL_TEXTURE_2D, kLevel, kXOffset, kYOffset, kWidth, kHeight, kFormat, |
| - kType, kTransferBufferId, offset, GL_FALSE); |
| + kType, GetNextFreeTransferBufferId(), offset, GL_FALSE); |
| expected.set_token.Init(GetNextToken()); |
| void* mem = gl_->MapTexSubImage2DCHROMIUM( |
| @@ -1158,8 +1170,8 @@ TEST_F(GLES2ImplementationTest, GetMultipleIntegervCHROMIUMValidArgs) { |
| const uint32 kResultsOffset = AllocateTransferBuffer(kResultsSize); |
| Cmds expected; |
| expected.get_multiple.Init( |
| - kTransferBufferId, kPnamesOffset, kNumPnames, |
| - kTransferBufferId, kResultsOffset, kResultsSize); |
| + transfer_buffer_id_, kPnamesOffset, kNumPnames, |
| + transfer_buffer_id_, kResultsOffset, kResultsSize); |
| expected.set_token.Init(GetNextToken()); |
| const GLint kSentinel = 0x12345678; |
| @@ -1268,9 +1280,9 @@ TEST_F(GLES2ImplementationTest, GetProgramInfoCHROMIUMGoodArgs) { |
| Cmds expected; |
| expected.set_bucket_size1.Init(kBucketId, 0); |
| expected.get_program_info.Init(kProgramId, kBucketId); |
| - expected.get_bucket_size.Init(kBucketId, kTransferBufferId, 0); |
| + expected.get_bucket_size.Init(kBucketId, transfer_buffer_id_, 0); |
| expected.get_bucket_data.Init( |
| - kBucketId, 0, sizeof(kString), kTransferBufferId, offset); |
| + kBucketId, 0, sizeof(kString), transfer_buffer_id_, offset); |
| expected.set_token1.Init(GetNextToken()); |
| expected.set_bucket_size2.Init(kBucketId, 0); |
| gl_->GetProgramInfoCHROMIUM(kProgramId, sizeof(buf), &size, &buf); |
| @@ -1309,9 +1321,9 @@ TEST_F(GLES2ImplementationTest, GetProgramInfoCHROMIUMBadArgs) { |
| Cmds expected; |
| expected.set_bucket_size1.Init(kBucketId, 0); |
| expected.get_program_info.Init(kProgramId, kBucketId); |
| - expected.get_bucket_size.Init(kBucketId, kTransferBufferId, 0); |
| + expected.get_bucket_size.Init(kBucketId, transfer_buffer_id_, 0); |
| expected.get_bucket_data.Init( |
| - kBucketId, 0, sizeof(kString), kTransferBufferId, offset); |
| + kBucketId, 0, sizeof(kString), transfer_buffer_id_, offset); |
| expected.set_token1.Init(GetNextToken()); |
| expected.set_bucket_size2.Init(kBucketId, 0); |
| gl_->GetProgramInfoCHROMIUM(kProgramId, 6, &size, &buf); |
| @@ -1487,7 +1499,7 @@ TEST_F(GLES2ImplementationTest, TexImage2D) { |
| Cmds expected; |
| expected.tex_image_2d.Init( |
| kTarget, kLevel, kFormat, kWidth, kHeight, kBorder, kFormat, kType, |
| - kTransferBufferId, offset); |
| + transfer_buffer_id_, offset); |
| expected.set_token.Init(GetNextToken()); |
| gl_->TexImage2D( |
| kTarget, kLevel, kFormat, kWidth, kHeight, kBorder, kFormat, kType, |
| @@ -1502,7 +1514,7 @@ TEST_F(GLES2ImplementationTest, TexImage2D) { |
| Cmds2 expected2; |
| expected2.tex_image_2d.Init( |
| kTarget, kLevel, kFormat, kWidth, kHeight, kBorder, kFormat, kType, |
| - kTransferBufferId, offset2); |
| + transfer_buffer_id_, offset2); |
| expected2.set_token.Init(GetNextToken()); |
| const void* commands2 = GetPut(); |
| gl_->PixelStorei(GL_UNPACK_FLIP_Y_CHROMIUM, GL_TRUE); |
| @@ -1559,11 +1571,11 @@ TEST_F(GLES2ImplementationTest, TexImage2D2Writes) { |
| 0, 0); |
| expected.tex_sub_image_2d1.Init( |
| kTarget, kLevel, 0, 0, kWidth, kHeight / 2, kFormat, kType, |
| - kTransferBufferId, offset1, true); |
| + transfer_buffer_id_, offset1, true); |
| expected.set_token1.Init(GetNextToken()); |
| expected.tex_sub_image_2d2.Init( |
| kTarget, kLevel, 0, kHeight / 2, kWidth, kHeight / 2, kFormat, kType, |
| - kTransferBufferId, offset2, true); |
| + transfer_buffer_id_, offset2, true); |
| expected.set_token2.Init(GetNextToken()); |
| // TODO(gman): Make it possible to run this test |
| @@ -1592,11 +1604,11 @@ TEST_F(GLES2ImplementationTest, TexImage2D2Writes) { |
| 0, 0); |
| expected.tex_sub_image_2d1.Init( |
| kTarget, kLevel, 0, kHeight / 2, kWidth, kHeight / 2, kFormat, kType, |
| - kTransferBufferId, offset3, true); |
| + transfer_buffer_id_, offset3, true); |
| expected.set_token1.Init(GetNextToken()); |
| expected.tex_sub_image_2d2.Init( |
| kTarget, kLevel, 0, 0, kWidth, kHeight / 2, kFormat, kType, |
| - kTransferBufferId, offset4, true); |
| + transfer_buffer_id_, offset4, true); |
| expected.set_token2.Init(GetNextToken()); |
| // TODO(gman): Make it possible to run this test |
| @@ -1662,19 +1674,19 @@ TEST_F(GLES2ImplementationTest, TexImage2DSubRows) { |
| 0, 0); |
| expected.tex_sub_image_2d1.Init( |
| kTarget, kLevel, 0, 0, kWidth / 2, 1, kFormat, kType, |
| - kTransferBufferId, offset1, true); |
| + transfer_buffer_id_, offset1, true); |
| expected.set_token1.Init(GetNextToken()); |
| expected.tex_sub_image_2d2.Init( |
| kTarget, kLevel, kWidth / 2, 0, kWidth / 2, 1, kFormat, kType, |
| - kTransferBufferId, offset2, true); |
| + transfer_buffer_id_, offset2, true); |
| expected.set_token2.Init(GetNextToken()); |
| expected.tex_sub_image_2d3.Init( |
| kTarget, kLevel, 0, 1, kWidth / 2, 1, kFormat, kType, |
| - kTransferBufferId, offset3, true); |
| + transfer_buffer_id_, offset3, true); |
| expected.set_token3.Init(GetNextToken()); |
| expected.tex_sub_image_2d4.Init( |
| kTarget, kLevel, kWidth / 2, 1, kWidth / 2, 1, kFormat, kType, |
| - kTransferBufferId, offset4, true); |
| + transfer_buffer_id_, offset4, true); |
| expected.set_token4.Init(GetNextToken()); |
| // TODO(gman): Make it possible to run this test |
| @@ -1713,19 +1725,19 @@ TEST_F(GLES2ImplementationTest, TexImage2DSubRows) { |
| 0, 0); |
| expected.tex_sub_image_2d1.Init( |
| kTarget, kLevel, 0, 1, kWidth / 2, 1, kFormat, kType, |
| - kTransferBufferId, offset1, true); |
| + transfer_buffer_id_, offset1, true); |
| expected.set_token1.Init(GetNextToken()); |
| expected.tex_sub_image_2d2.Init( |
| kTarget, kLevel, kWidth / 2, 1, kWidth / 2, 1, kFormat, kType, |
| - kTransferBufferId, offset2, true); |
| + transfer_buffer_id_, offset2, true); |
| expected.set_token2.Init(GetNextToken()); |
| expected.tex_sub_image_2d3.Init( |
| kTarget, kLevel, 0, 0, kWidth / 2, 1, kFormat, kType, |
| - kTransferBufferId, offset3, true); |
| + transfer_buffer_id_, offset3, true); |
| expected.set_token3.Init(GetNextToken()); |
| expected.tex_sub_image_2d4.Init( |
| kTarget, kLevel, kWidth / 2, 0, kWidth / 2, 1, kFormat, kType, |
| - kTransferBufferId, offset4, true); |
| + transfer_buffer_id_, offset4, true); |
| expected.set_token4.Init(GetNextToken()); |
| // TODO(gman): Make it possible to run this test |
| @@ -1837,7 +1849,7 @@ TEST_F(GLES2ImplementationTest, CreateStreamTextureCHROMIUM) { |
| }; |
| Cmds expected; |
| - expected.create_stream.Init(kTextureId, kTransferBufferId, kResultOffset); |
| + expected.create_stream.Init(kTextureId, transfer_buffer_id_, kResultOffset); |
| EXPECT_CALL(*command_buffer_, OnFlush(_)) |
| .WillOnce(SetMemoryAtOffset(kResultOffset, kResult)) |
