summaryrefslogtreecommitdiffstats
path: root/gpu/command_buffer/client
diff options
context:
space:
mode:
Diffstat (limited to 'gpu/command_buffer/client')
-rw-r--r--gpu/command_buffer/client/cmd_buffer_helper_test.cc14
-rw-r--r--gpu/command_buffer/client/fenced_allocator_test.cc16
-rw-r--r--gpu/command_buffer/client/gles2_demo.cc10
-rw-r--r--gpu/command_buffer/client/mapped_memory_unittest.cc14
-rw-r--r--gpu/command_buffer/client/ring_buffer_test.cc16
5 files changed, 35 insertions, 35 deletions
diff --git a/gpu/command_buffer/client/cmd_buffer_helper_test.cc b/gpu/command_buffer/client/cmd_buffer_helper_test.cc
index 9f526df..1daa942 100644
--- a/gpu/command_buffer/client/cmd_buffer_helper_test.cc
+++ b/gpu/command_buffer/client/cmd_buffer_helper_test.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -10,7 +10,7 @@
#include "gpu/command_buffer/client/cmd_buffer_helper.h"
#include "gpu/command_buffer/service/mocks.h"
#include "gpu/command_buffer/service/command_buffer_service.h"
-#include "gpu/command_buffer/service/gpu_processor.h"
+#include "gpu/command_buffer/service/gpu_scheduler.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace gpu {
@@ -77,19 +77,19 @@ class CommandBufferHelperTest : public testing::Test {
.WillRepeatedly(
Invoke(do_jump_command_.get(), &DoJumpCommand::DoCommand));
- gpu_processor_.reset(new GPUProcessor(
+ gpu_scheduler_.reset(new GpuScheduler(
command_buffer_.get(), NULL, parser_, 1));
command_buffer_->SetPutOffsetChangeCallback(NewCallback(
- gpu_processor_.get(), &GPUProcessor::ProcessCommands));
+ gpu_scheduler_.get(), &GpuScheduler::ProcessCommands));
- api_mock_->set_engine(gpu_processor_.get());
+ api_mock_->set_engine(gpu_scheduler_.get());
helper_.reset(new CommandBufferHelper(command_buffer_.get()));
helper_->Initialize(kCommandBufferSizeBytes);
}
virtual void TearDown() {
- // If the GPUProcessor posts any tasks, this forces them to run.
+ // If the GpuScheduler posts any tasks, this forces them to run.
MessageLoop::current()->RunAllPending();
}
@@ -156,7 +156,7 @@ class CommandBufferHelperTest : public testing::Test {
MessageLoop message_loop_;
scoped_ptr<AsyncAPIMock> api_mock_;
scoped_ptr<CommandBufferService> command_buffer_;
- scoped_ptr<GPUProcessor> gpu_processor_;
+ scoped_ptr<GpuScheduler> gpu_scheduler_;
CommandParser* parser_;
scoped_ptr<CommandBufferHelper> helper_;
Sequence sequence_;
diff --git a/gpu/command_buffer/client/fenced_allocator_test.cc b/gpu/command_buffer/client/fenced_allocator_test.cc
index 658deef2..533e867 100644
--- a/gpu/command_buffer/client/fenced_allocator_test.cc
+++ b/gpu/command_buffer/client/fenced_allocator_test.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -12,7 +12,7 @@
#include "gpu/command_buffer/service/cmd_buffer_engine.h"
#include "gpu/command_buffer/service/mocks.h"
#include "gpu/command_buffer/service/command_buffer_service.h"
-#include "gpu/command_buffer/service/gpu_processor.h"
+#include "gpu/command_buffer/service/gpu_scheduler.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace gpu {
@@ -51,12 +51,12 @@ class BaseFencedAllocatorTest : public testing::Test {
0,
api_mock_.get());
- gpu_processor_.reset(new GPUProcessor(
+ gpu_scheduler_.reset(new GpuScheduler(
command_buffer_.get(), NULL, parser_, INT_MAX));
command_buffer_->SetPutOffsetChangeCallback(NewCallback(
- gpu_processor_.get(), &GPUProcessor::ProcessCommands));
+ gpu_scheduler_.get(), &GpuScheduler::ProcessCommands));
- api_mock_->set_engine(gpu_processor_.get());
+ api_mock_->set_engine(gpu_scheduler_.get());
helper_.reset(new CommandBufferHelper(command_buffer_.get()));
helper_->Initialize(kBufferSize);
@@ -70,7 +70,7 @@ class BaseFencedAllocatorTest : public testing::Test {
MessageLoop message_loop_;
scoped_ptr<AsyncAPIMock> api_mock_;
scoped_ptr<CommandBufferService> command_buffer_;
- scoped_ptr<GPUProcessor> gpu_processor_;
+ scoped_ptr<GpuScheduler> gpu_scheduler_;
CommandParser* parser_;
scoped_ptr<CommandBufferHelper> helper_;
};
@@ -91,7 +91,7 @@ class FencedAllocatorTest : public BaseFencedAllocatorTest {
}
virtual void TearDown() {
- // If the GPUProcessor posts any tasks, this forces them to run.
+ // If the GpuScheduler posts any tasks, this forces them to run.
MessageLoop::current()->RunAllPending();
EXPECT_TRUE(allocator_->CheckConsistency());
@@ -387,7 +387,7 @@ class FencedAllocatorWrapperTest : public BaseFencedAllocatorTest {
}
virtual void TearDown() {
- // If the GPUProcessor posts any tasks, this forces them to run.
+ // If the GpuScheduler posts any tasks, this forces them to run.
MessageLoop::current()->RunAllPending();
EXPECT_TRUE(allocator_->CheckConsistency());
diff --git a/gpu/command_buffer/client/gles2_demo.cc b/gpu/command_buffer/client/gles2_demo.cc
index 91ef9bf2..096a9d3 100644
--- a/gpu/command_buffer/client/gles2_demo.cc
+++ b/gpu/command_buffer/client/gles2_demo.cc
@@ -19,7 +19,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
#include "base/shared_memory.h"
-#include "gpu/command_buffer/service/gpu_processor.h"
+#include "gpu/command_buffer/service/gpu_scheduler.h"
#include "gpu/command_buffer/service/command_buffer_service.h"
#include "gpu/command_buffer/client/gles2_implementation.h"
#include "gpu/command_buffer/client/gles2_lib.h"
@@ -29,7 +29,7 @@
using base::SharedMemory;
using gpu::Buffer;
-using gpu::GPUProcessor;
+using gpu::GpuScheduler;
using gpu::CommandBufferService;
using gpu::gles2::GLES2CmdHelper;
using gpu::gles2::GLES2Implementation;
@@ -56,8 +56,8 @@ bool GLES2Demo::Setup(void* hwnd, int32 size) {
if (!command_buffer->Initialize(size))
return NULL;
- GPUProcessor* gpu_processor = new GPUProcessor(command_buffer.get(), NULL);
- if (!gpu_processor->Initialize(reinterpret_cast<HWND>(hwnd),
+ GpuScheduler* gpu_scheduler = new GpuScheduler(command_buffer.get(), NULL);
+ if (!gpu_scheduler->Initialize(reinterpret_cast<HWND>(hwnd),
gfx::Size(),
gpu::gles2::DisallowedExtensions(),
NULL,
@@ -68,7 +68,7 @@ bool GLES2Demo::Setup(void* hwnd, int32 size) {
}
command_buffer->SetPutOffsetChangeCallback(
- NewCallback(gpu_processor, &GPUProcessor::ProcessCommands));
+ NewCallback(gpu_scheduler, &GpuScheduler::ProcessCommands));
GLES2CmdHelper* helper = new GLES2CmdHelper(command_buffer.get());
if (!helper->Initialize(size)) {
diff --git a/gpu/command_buffer/client/mapped_memory_unittest.cc b/gpu/command_buffer/client/mapped_memory_unittest.cc
index 87bac68..93e63e7 100644
--- a/gpu/command_buffer/client/mapped_memory_unittest.cc
+++ b/gpu/command_buffer/client/mapped_memory_unittest.cc
@@ -10,7 +10,7 @@
#include "gpu/command_buffer/client/cmd_buffer_helper.h"
#include "gpu/command_buffer/service/mocks.h"
#include "gpu/command_buffer/service/command_buffer_service.h"
-#include "gpu/command_buffer/service/gpu_processor.h"
+#include "gpu/command_buffer/service/gpu_scheduler.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace gpu {
@@ -49,12 +49,12 @@ class MappedMemoryTestBase : public testing::Test {
0,
api_mock_.get());
- gpu_processor_.reset(new GPUProcessor(
+ gpu_scheduler_.reset(new GpuScheduler(
command_buffer_.get(), NULL, parser_, INT_MAX));
command_buffer_->SetPutOffsetChangeCallback(NewCallback(
- gpu_processor_.get(), &GPUProcessor::ProcessCommands));
+ gpu_scheduler_.get(), &GpuScheduler::ProcessCommands));
- api_mock_->set_engine(gpu_processor_.get());
+ api_mock_->set_engine(gpu_scheduler_.get());
helper_.reset(new CommandBufferHelper(command_buffer_.get()));
helper_->Initialize(kBufferSize);
@@ -68,7 +68,7 @@ class MappedMemoryTestBase : public testing::Test {
MessageLoop message_loop_;
scoped_ptr<AsyncAPIMock> api_mock_;
scoped_ptr<CommandBufferService> command_buffer_;
- scoped_ptr<GPUProcessor> gpu_processor_;
+ scoped_ptr<GpuScheduler> gpu_scheduler_;
CommandParser* parser_;
scoped_ptr<CommandBufferHelper> helper_;
};
@@ -94,7 +94,7 @@ class MemoryChunkTest : public MappedMemoryTestBase {
}
virtual void TearDown() {
- // If the GPUProcessor posts any tasks, this forces them to run.
+ // If the GpuScheduler posts any tasks, this forces them to run.
MessageLoop::current()->RunAllPending();
MappedMemoryTestBase::TearDown();
@@ -145,7 +145,7 @@ class MappedMemoryManagerTest : public MappedMemoryTestBase {
}
virtual void TearDown() {
- // If the GPUProcessor posts any tasks, this forces them to run.
+ // If the GpuScheduler posts any tasks, this forces them to run.
MessageLoop::current()->RunAllPending();
manager_.reset();
MappedMemoryTestBase::TearDown();
diff --git a/gpu/command_buffer/client/ring_buffer_test.cc b/gpu/command_buffer/client/ring_buffer_test.cc
index 6510611..e3c14c7 100644
--- a/gpu/command_buffer/client/ring_buffer_test.cc
+++ b/gpu/command_buffer/client/ring_buffer_test.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -12,7 +12,7 @@
#include "gpu/command_buffer/service/cmd_buffer_engine.h"
#include "gpu/command_buffer/service/mocks.h"
#include "gpu/command_buffer/service/command_buffer_service.h"
-#include "gpu/command_buffer/service/gpu_processor.h"
+#include "gpu/command_buffer/service/gpu_scheduler.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace gpu {
@@ -52,12 +52,12 @@ class BaseRingBufferTest : public testing::Test {
0,
api_mock_.get());
- gpu_processor_.reset(new GPUProcessor(
+ gpu_scheduler_.reset(new GpuScheduler(
command_buffer_.get(), NULL, parser_, INT_MAX));
command_buffer_->SetPutOffsetChangeCallback(NewCallback(
- gpu_processor_.get(), &GPUProcessor::ProcessCommands));
+ gpu_scheduler_.get(), &GpuScheduler::ProcessCommands));
- api_mock_->set_engine(gpu_processor_.get());
+ api_mock_->set_engine(gpu_scheduler_.get());
helper_.reset(new CommandBufferHelper(command_buffer_.get()));
helper_->Initialize(kBufferSize);
@@ -71,7 +71,7 @@ class BaseRingBufferTest : public testing::Test {
MessageLoop message_loop_;
scoped_ptr<AsyncAPIMock> api_mock_;
scoped_ptr<CommandBufferService> command_buffer_;
- scoped_ptr<GPUProcessor> gpu_processor_;
+ scoped_ptr<GpuScheduler> gpu_scheduler_;
CommandParser* parser_;
scoped_ptr<CommandBufferHelper> helper_;
};
@@ -93,7 +93,7 @@ class RingBufferTest : public BaseRingBufferTest {
}
virtual void TearDown() {
- // If the GPUProcessor posts any tasks, this forces them to run.
+ // If the GpuScheduler posts any tasks, this forces them to run.
MessageLoop::current()->RunAllPending();
BaseRingBufferTest::TearDown();
@@ -189,7 +189,7 @@ class RingBufferWrapperTest : public BaseRingBufferTest {
}
virtual void TearDown() {
- // If the GPUProcessor posts any tasks, this forces them to run.
+ // If the GpuScheduler posts any tasks, this forces them to run.
MessageLoop::current()->RunAllPending();
BaseRingBufferTest::TearDown();
generated by cgit v1.1 at 2025-02-19 15:21:33 +0000