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

Side by Side Diff: gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc

Issue 116863003: gpu: Reuse transfer buffers more aggresively (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Async upload token part of existing Async command; use separate shared memory to sync async upload … Created 6 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "gpu/command_buffer/service/gles2_cmd_decoder.h" 5 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/strings/string_number_conversions.h" 8 #include "base/strings/string_number_conversions.h"
9 #include "gpu/command_buffer/common/gles2_cmd_format.h" 9 #include "gpu/command_buffer/common/gles2_cmd_format.h"
10 #include "gpu/command_buffer/common/gles2_cmd_utils.h" 10 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
(...skipping 8032 matching lines...) Expand 10 before | Expand all | Expand 10 after
8043 // Set a mock Async delegate 8043 // Set a mock Async delegate
8044 StrictMock<gpu::MockAsyncPixelTransferManager>* manager = 8044 StrictMock<gpu::MockAsyncPixelTransferManager>* manager =
8045 new StrictMock<gpu::MockAsyncPixelTransferManager>; 8045 new StrictMock<gpu::MockAsyncPixelTransferManager>;
8046 manager->Initialize(group().texture_manager()); 8046 manager->Initialize(group().texture_manager());
8047 decoder_->SetAsyncPixelTransferManagerForTest(manager); 8047 decoder_->SetAsyncPixelTransferManagerForTest(manager);
8048 StrictMock<gpu::MockAsyncPixelTransferDelegate>* delegate = NULL; 8048 StrictMock<gpu::MockAsyncPixelTransferDelegate>* delegate = NULL;
8049 8049
8050 // Tex(Sub)Image2D upload commands. 8050 // Tex(Sub)Image2D upload commands.
8051 AsyncTexImage2DCHROMIUM teximage_cmd; 8051 AsyncTexImage2DCHROMIUM teximage_cmd;
8052 teximage_cmd.Init(GL_TEXTURE_2D, 0, GL_RGBA, 8, 8, 0, GL_RGBA, 8052 teximage_cmd.Init(GL_TEXTURE_2D, 0, GL_RGBA, 8, 8, 0, GL_RGBA,
8053 GL_UNSIGNED_BYTE, kSharedMemoryId, kSharedMemoryOffset); 8053 GL_UNSIGNED_BYTE, kSharedMemoryId, kSharedMemoryOffset,
8054 0, 0, 0);
8054 AsyncTexSubImage2DCHROMIUM texsubimage_cmd; 8055 AsyncTexSubImage2DCHROMIUM texsubimage_cmd;
8055 texsubimage_cmd.Init(GL_TEXTURE_2D, 0, 0, 0, 8, 8, GL_RGBA, 8056 texsubimage_cmd.Init(GL_TEXTURE_2D, 0, 0, 0, 8, 8, GL_RGBA,
8056 GL_UNSIGNED_BYTE, kSharedMemoryId, kSharedMemoryOffset); 8057 GL_UNSIGNED_BYTE, kSharedMemoryId, kSharedMemoryOffset,
8058 0, 0, 0);
8057 WaitAsyncTexImage2DCHROMIUM wait_cmd; 8059 WaitAsyncTexImage2DCHROMIUM wait_cmd;
8058 wait_cmd.Init(GL_TEXTURE_2D); 8060 wait_cmd.Init(GL_TEXTURE_2D);
8059 8061
8060 // No transfer state exists initially. 8062 // No transfer state exists initially.
8061 EXPECT_FALSE( 8063 EXPECT_FALSE(
8062 decoder_->GetAsyncPixelTransferManager()->GetPixelTransferDelegate( 8064 decoder_->GetAsyncPixelTransferManager()->GetPixelTransferDelegate(
8063 texture_ref)); 8065 texture_ref));
8064 8066
8065 base::Closure bind_callback; 8067 base::Closure bind_callback;
8066 8068
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
8232 8234
8233 // Set a mock Async delegate. 8235 // Set a mock Async delegate.
8234 StrictMock<gpu::MockAsyncPixelTransferManager>* manager = 8236 StrictMock<gpu::MockAsyncPixelTransferManager>* manager =
8235 new StrictMock<gpu::MockAsyncPixelTransferManager>; 8237 new StrictMock<gpu::MockAsyncPixelTransferManager>;
8236 manager->Initialize(group().texture_manager()); 8238 manager->Initialize(group().texture_manager());
8237 decoder_->SetAsyncPixelTransferManagerForTest(manager); 8239 decoder_->SetAsyncPixelTransferManagerForTest(manager);
8238 StrictMock<gpu::MockAsyncPixelTransferDelegate>* delegate = NULL; 8240 StrictMock<gpu::MockAsyncPixelTransferDelegate>* delegate = NULL;
8239 8241
8240 AsyncTexImage2DCHROMIUM teximage_cmd; 8242 AsyncTexImage2DCHROMIUM teximage_cmd;
8241 teximage_cmd.Init(GL_TEXTURE_2D, 0, GL_RGBA, 8, 8, 0, GL_RGBA, 8243 teximage_cmd.Init(GL_TEXTURE_2D, 0, GL_RGBA, 8, 8, 0, GL_RGBA,
8242 GL_UNSIGNED_BYTE, kSharedMemoryId, kSharedMemoryOffset); 8244 GL_UNSIGNED_BYTE, kSharedMemoryId, kSharedMemoryOffset,
8245 0, 0, 0);
8243 8246
8244 // No transfer delegate exists initially. 8247 // No transfer delegate exists initially.
8245 EXPECT_FALSE( 8248 EXPECT_FALSE(
8246 decoder_->GetAsyncPixelTransferManager()->GetPixelTransferDelegate( 8249 decoder_->GetAsyncPixelTransferManager()->GetPixelTransferDelegate(
8247 texture_ref)); 8250 texture_ref));
8248 8251
8249 // Create delegate on AsyncTexImage2D. 8252 // Create delegate on AsyncTexImage2D.
8250 { 8253 {
8251 EXPECT_CALL(*manager, CreatePixelTransferDelegateImpl(texture_ref, _)) 8254 EXPECT_CALL(*manager, CreatePixelTransferDelegateImpl(texture_ref, _))
8252 .WillOnce(Return( 8255 .WillOnce(Return(
(...skipping 625 matching lines...) Expand 10 before | Expand all | Expand 10 after
8878 // TODO(gman): TexImage2DImmediate 8881 // TODO(gman): TexImage2DImmediate
8879 8882
8880 // TODO(gman): TexSubImage2DImmediate 8883 // TODO(gman): TexSubImage2DImmediate
8881 8884
8882 // TODO(gman): UseProgram 8885 // TODO(gman): UseProgram
8883 8886
8884 // TODO(gman): SwapBuffers 8887 // TODO(gman): SwapBuffers
8885 8888
8886 } // namespace gles2 8889 } // namespace gles2
8887 } // namespace gpu 8890 } // namespace gpu
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698