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

Side by Side Diff: gpu/command_buffer/client/gles2_implementation_unittest.cc

Issue 6316002: Make CommandBuffer::Flush asynchronous, and add CommandBuffer::FlushSync with former semantics. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 years, 11 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Tests for the Command Buffer Helper. 5 // Tests for the Command Buffer Helper.
6 6
7 #include "gpu/command_buffer/client/gles2_implementation.h" 7 #include "gpu/command_buffer/client/gles2_implementation.h"
8 #include "gpu/command_buffer/common/command_buffer.h" 8 #include "gpu/command_buffer/common/command_buffer.h"
9 #include "gpu/GLES2/gles2_command_buffer.h" 9 #include "gpu/GLES2/gles2_command_buffer.h"
10 #include "testing/gtest/include/gtest/gtest.h" 10 #include "testing/gtest/include/gtest/gtest.h"
(...skipping 19 matching lines...) Expand all
30 } 30 }
31 31
32 virtual Buffer GetRingBuffer() { 32 virtual Buffer GetRingBuffer() {
33 return ring_buffer_buffer_; 33 return ring_buffer_buffer_;
34 } 34 }
35 35
36 virtual State GetState() { 36 virtual State GetState() {
37 return state_; 37 return state_;
38 } 38 }
39 39
40 virtual State Flush(int32 put_offset) { 40 virtual void Flush(int32 put_offset) {
41 state_.put_offset = put_offset;
42 }
43
44 virtual State FlushSync(int32 put_offset) {
41 state_.put_offset = put_offset; 45 state_.put_offset = put_offset;
42 state_.get_offset = put_offset; 46 state_.get_offset = put_offset;
43 OnFlush(transfer_buffer_buffer_.ptr); 47 OnFlush(transfer_buffer_buffer_.ptr);
44 48
45 return state_; 49 return state_;
46 } 50 }
47 51
48 virtual void SetGetOffset(int32 get_offset) { 52 virtual void SetGetOffset(int32 get_offset) {
49 state_.get_offset = get_offset; 53 state_.get_offset = get_offset;
50 } 54 }
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 #endif 188 #endif
185 189
186 gl_.reset(new GLES2Implementation( 190 gl_.reset(new GLES2Implementation(
187 helper_.get(), 191 helper_.get(),
188 kTransferBufferSize, 192 kTransferBufferSize,
189 transfer_buffer_.ptr, 193 transfer_buffer_.ptr,
190 kTransferBufferId, 194 kTransferBufferId,
191 false)); 195 false));
192 196
193 EXPECT_CALL(*command_buffer_, OnFlush(_)).Times(1).RetiresOnSaturation(); 197 EXPECT_CALL(*command_buffer_, OnFlush(_)).Times(1).RetiresOnSaturation();
194 helper_->CommandBufferHelper::Flush(); 198 helper_->CommandBufferHelper::FlushSync();
195 Buffer ring_buffer = command_buffer_->GetRingBuffer(); 199 Buffer ring_buffer = command_buffer_->GetRingBuffer();
196 commands_ = static_cast<CommandBufferEntry*>(ring_buffer.ptr) + 200 commands_ = static_cast<CommandBufferEntry*>(ring_buffer.ptr) +
197 command_buffer_->GetState().put_offset; 201 command_buffer_->GetState().put_offset;
198 } 202 }
199 203
200 virtual void TearDown() { 204 virtual void TearDown() {
201 } 205 }
202 206
203 void ClearTransferBuffer() { 207 void ClearTransferBuffer() {
204 memset(transfer_buffer_.ptr, kInitialValue, kTransferBufferSize); 208 memset(transfer_buffer_.ptr, kInitialValue, kTransferBufferSize);
(...skipping 748 matching lines...) Expand 10 before | Expand all | Expand 10 after
953 EXPECT_EQ(static_cast<GLenum>(GL_INVALID_ENUM), gl_->GetError()); 957 EXPECT_EQ(static_cast<GLenum>(GL_INVALID_ENUM), gl_->GetError());
954 const char* kPtr = "something"; 958 const char* kPtr = "something";
955 gl_->UnmapTexSubImage2DCHROMIUM(kPtr); 959 gl_->UnmapTexSubImage2DCHROMIUM(kPtr);
956 EXPECT_EQ(static_cast<GLenum>(GL_INVALID_VALUE), gl_->GetError()); 960 EXPECT_EQ(static_cast<GLenum>(GL_INVALID_VALUE), gl_->GetError());
957 } 961 }
958 962
959 } // namespace gles2 963 } // namespace gles2
960 } // namespace gpu 964 } // namespace gpu
961 965
962 966
OLDNEW
« no previous file with comments | « gpu/command_buffer/client/cmd_buffer_helper.cc ('k') | gpu/command_buffer/common/command_buffer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698