diff options
| author | boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-04 21:37:12 +0000 |
|---|---|---|
| committer | boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-04 21:37:12 +0000 |
| commit | 6d66889e60c2ed2f6da8affb7399bba857c6dc30 (patch) | |
| tree | c83f6c8166446d1307c49d8e4811d5063e313839 /gpu/gles2_conform_support | |
| parent | f32c2fdc3019a766f9fa8a79ba11528e036cef97 (diff) | |
| download | chromium_src-6d66889e60c2ed2f6da8affb7399bba857c6dc30.zip chromium_src-6d66889e60c2ed2f6da8affb7399bba857c6dc30.tar.gz chromium_src-6d66889e60c2ed2f6da8affb7399bba857c6dc30.tar.bz2 | |
Introduce gpu::Capabilities
gpu::Capabilities is a subset of FeatureInfo that is exposed
to the command buffer client.
It is populated in GlES2Implementation::Initialize,
piggy-backing on the synchronous init ipc.
Make ContextProviderInProcess use gpu::Capabilities as well
instead of hardcoding them.
Merged GpuControl::SupportsGpuMemoryBuffer into capabilities.
BUG=285390
Review URL: https://codereview.chromium.org/73263003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238779 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/gles2_conform_support')
| -rw-r--r-- | gpu/gles2_conform_support/egl/display.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gpu/gles2_conform_support/egl/display.cc b/gpu/gles2_conform_support/egl/display.cc index 6cbd047..118ef72 100644 --- a/gpu/gles2_conform_support/egl/display.cc +++ b/gpu/gles2_conform_support/egl/display.cc @@ -123,8 +123,6 @@ EGLSurface Display::CreateWindowSurface(EGLConfig config, gpu_scheduler_.reset(new gpu::GpuScheduler(command_buffer.get(), decoder_.get(), NULL)); - gpu_control_.reset( - new gpu::GpuControlService(NULL, NULL, group->mailbox_manager(), NULL)); decoder_->set_engine(gpu_scheduler_.get()); gfx::Size size(create_offscreen_width_, create_offscreen_height_); @@ -172,6 +170,9 @@ EGLSurface Display::CreateWindowSurface(EGLConfig config, return EGL_NO_SURFACE; } + gpu_control_.reset(new gpu::GpuControlService( + NULL, NULL, group->mailbox_manager(), NULL, decoder_->GetCapabilities())); + command_buffer->SetPutOffsetChangeCallback( base::Bind(&gpu::GpuScheduler::PutChanged, base::Unretained(gpu_scheduler_.get()))); |