diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-12 00:25:46 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-12 00:25:46 +0000 |
| commit | e134cf21752f90003a17fe0a0d38a05fe2728edb (patch) | |
| tree | 2f9a59be1e117bb1d14660bc94f7d884e03e169c /media | |
| parent | e4d9a972ed8350b5e45f5da90b2a1b5ab47c1ca7 (diff) | |
| download | chromium_src-e134cf21752f90003a17fe0a0d38a05fe2728edb.zip chromium_src-e134cf21752f90003a17fe0a0d38a05fe2728edb.tar.gz chromium_src-e134cf21752f90003a17fe0a0d38a05fe2728edb.tar.bz2 | |
Reland 85013 - Split GLContext::Create*GLContext into GLSurface::Create*GLSurface plus a surface type independent GLContext::CreateGLContext.
TEST=webgl on windows and mac, trybots
BUG=none
Review URL: http://codereview.chromium.org/6997003
Review URL: http://codereview.chromium.org/7015016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85081 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/tools/shader_bench/shader_bench.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/media/tools/shader_bench/shader_bench.cc b/media/tools/shader_bench/shader_bench.cc index 557d18d..077bfd2 100644 --- a/media/tools/shader_bench/shader_bench.cc +++ b/media/tools/shader_bench/shader_bench.cc @@ -22,6 +22,7 @@ #include "ui/gfx/gl/gl_bindings.h" #include "ui/gfx/gl/gl_context.h" #include "ui/gfx/gl/gl_implementation.h" +#include "ui/gfx/gl/gl_surface.h" #include "ui/gfx/native_widget_types.h" #if defined(OS_LINUX) @@ -130,10 +131,11 @@ int main(int argc, char** argv) { // Initialize window and graphics context. base::AtExitManager at_exit_manager; - gfx::GLContext::InitializeOneOff(); + gfx::GLSurface::InitializeOneOff(); scoped_ptr<media::Window> window(new media::Window(width, height)); - gfx::GLContext* context = - gfx::GLContext::CreateViewGLContext(window->PluginWindow(), false); + gfx::GLSurface* surface = + gfx::GLSurface::CreateViewGLSurface(window->PluginWindow()); + gfx::GLContext* context = gfx::GLContext::CreateGLContext(surface, NULL); context->MakeCurrent(); // This sets D3DPRESENT_INTERVAL_IMMEDIATE on Windows. context->SetSwapInterval(0); |