diff options
author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-14 23:16:22 +0000 |
---|---|---|
committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-14 23:16:22 +0000 |
commit | 09ddb91f6a81adebe023e461387c6510471e6778 (patch) | |
tree | 2abb8507621721af69610222aace5e7818885c08 /gpu/demos | |
parent | 6cf19311fbe08c5c8c674a50fd834ae818b549c0 (diff) | |
download | chromium_src-09ddb91f6a81adebe023e461387c6510471e6778.zip chromium_src-09ddb91f6a81adebe023e461387c6510471e6778.tar.gz chromium_src-09ddb91f6a81adebe023e461387c6510471e6778.tar.bz2 |
Landing issue 6828049 on behalf of KushalP.
http://codereview.chromium.org/6826049/
Original message:
Renaming GPUProcessor to GpuScheduler
TEST=try
BUG=76585
Review URL: http://codereview.chromium.org/6853027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81667 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/demos')
-rw-r--r-- | gpu/demos/framework/window.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gpu/demos/framework/window.cc b/gpu/demos/framework/window.cc index fead4ac..974a5ee 100644 --- a/gpu/demos/framework/window.cc +++ b/gpu/demos/framework/window.cc @@ -8,13 +8,13 @@ #include "gpu/command_buffer/client/gles2_implementation.h" #include "gpu/command_buffer/client/gles2_lib.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 "gpu/demos/framework/demo.h" #include "gpu/demos/framework/demo_factory.h" using gpu::Buffer; using gpu::CommandBufferService; -using gpu::GPUProcessor; +using gpu::GpuScheduler; using gpu::gles2::GLES2CmdHelper; using gpu::gles2::GLES2Implementation; @@ -59,9 +59,9 @@ bool Window::CreateRenderContext(gfx::PluginWindowHandle hwnd) { return false; } - GPUProcessor* gpu_processor( - new GPUProcessor(command_buffer.get(), NULL)); - if (!gpu_processor->Initialize(hwnd, gfx::Size(), + GpuScheduler* gpu_scheduler( + new GpuScheduler(command_buffer.get(), NULL)); + if (!gpu_scheduler->Initialize(hwnd, gfx::Size(), gpu::gles2::DisallowedExtensions(), NULL, std::vector<int32>(), NULL, 0)) { @@ -69,7 +69,7 @@ bool Window::CreateRenderContext(gfx::PluginWindowHandle hwnd) { } command_buffer->SetPutOffsetChangeCallback( - NewCallback(gpu_processor, &GPUProcessor::ProcessCommands)); + NewCallback(gpu_scheduler, &GpuScheduler::ProcessCommands)); GLES2CmdHelper* helper = new GLES2CmdHelper(command_buffer.get()); if (!helper->Initialize(kCommandBufferSize)) { |