diff options
| author | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-04 20:04:04 +0000 |
|---|---|---|
| committer | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-04 20:04:04 +0000 |
| commit | 16cb745a833a6e86012ee7dab0878941cdf7f7f0 (patch) | |
| tree | 610d381e58f598c1a528669466e74fa4343bee61 /gpu | |
| parent | b8acc61f423293b4dacba4f2ef42af0c5d0b0a28 (diff) | |
| download | chromium_src-16cb745a833a6e86012ee7dab0878941cdf7f7f0.zip chromium_src-16cb745a833a6e86012ee7dab0878941cdf7f7f0.tar.gz chromium_src-16cb745a833a6e86012ee7dab0878941cdf7f7f0.tar.bz2 | |
Fix OpenGL ES 2.0 Conformance tests support
TEST=ran tests
BUG=none
TBR=apatrick@chromum.org
Review URL: http://codereview.chromium.org/7575005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95474 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/gles2_conform_support/egl/display.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gpu/gles2_conform_support/egl/display.cc b/gpu/gles2_conform_support/egl/display.cc index 6485e33..7baa94e 100644 --- a/gpu/gles2_conform_support/egl/display.cc +++ b/gpu/gles2_conform_support/egl/display.cc @@ -7,6 +7,7 @@ #include <vector> #include "gpu/command_buffer/client/gles2_lib.h" #include "gpu/command_buffer/service/command_buffer_service.h" +#include "gpu/command_buffer/service/context_group.h" #include "gpu/command_buffer/service/gles2_cmd_decoder.h" #include "gpu/command_buffer/service/gpu_scheduler.h" #include "gpu/GLES2/gles2_command_buffer.h" @@ -108,10 +109,11 @@ EGLSurface Display::CreateWindowSurface(EGLConfig config, using gpu::GpuScheduler; std::vector<int32> attribs; + gpu::gles2::ContextGroup::Ref group(new gpu::gles2::ContextGroup()); scoped_ptr<GpuScheduler> gpu_scheduler( GpuScheduler::Create(command_buffer_.get(), NULL, - NULL)); + group.get())); if (!gpu_scheduler->Initialize( win, gfx::Size(), false, gpu::gles2::DisallowedExtensions(), NULL, attribs, NULL)) |