diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-11 19:41:58 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-11 19:41:58 +0000 |
| commit | 333c5c9ca65425d1796d9d13abda37ecbce2c9fb (patch) | |
| tree | 85b92482a6ed18f7be48b153352436be89eb5b3e /media/tools/shader_bench | |
| parent | 374d9094395c15cd3b337de5c36587312fcc8a1e (diff) | |
| download | chromium_src-333c5c9ca65425d1796d9d13abda37ecbce2c9fb.zip chromium_src-333c5c9ca65425d1796d9d13abda37ecbce2c9fb.tar.gz chromium_src-333c5c9ca65425d1796d9d13abda37ecbce2c9fb.tar.bz2 | |
Revert 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
TBR=apatrick@chromium.org
Review URL: http://codereview.chromium.org/7015003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85016 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/tools/shader_bench')
| -rw-r--r-- | media/tools/shader_bench/shader_bench.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/media/tools/shader_bench/shader_bench.cc b/media/tools/shader_bench/shader_bench.cc index 077bfd2..557d18d 100644 --- a/media/tools/shader_bench/shader_bench.cc +++ b/media/tools/shader_bench/shader_bench.cc @@ -22,7 +22,6 @@ #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) @@ -131,11 +130,10 @@ int main(int argc, char** argv) { // Initialize window and graphics context. base::AtExitManager at_exit_manager; - gfx::GLSurface::InitializeOneOff(); + gfx::GLContext::InitializeOneOff(); scoped_ptr<media::Window> window(new media::Window(width, height)); - gfx::GLSurface* surface = - gfx::GLSurface::CreateViewGLSurface(window->PluginWindow()); - gfx::GLContext* context = gfx::GLContext::CreateGLContext(surface, NULL); + gfx::GLContext* context = + gfx::GLContext::CreateViewGLContext(window->PluginWindow(), false); context->MakeCurrent(); // This sets D3DPRESENT_INTERVAL_IMMEDIATE on Windows. context->SetSwapInterval(0); |