diff options
| author | antonm@chromium.org <antonm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-12 13:37:32 +0000 |
|---|---|---|
| committer | antonm@chromium.org <antonm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-12 13:37:32 +0000 |
| commit | 82642bb1c9402e67e46e0a48bdc075fd505fa36d (patch) | |
| tree | cdbf1eea862acdbc63634ba23e3a8b921bbf72bf /media/tools/shader_bench | |
| parent | cc12116ee5640dcca9507900f259ed6d6ed4542b (diff) | |
| download | chromium_src-82642bb1c9402e67e46e0a48bdc075fd505fa36d.zip chromium_src-82642bb1c9402e67e46e0a48bdc075fd505fa36d.tar.gz chromium_src-82642bb1c9402e67e46e0a48bdc075fd505fa36d.tar.bz2 | |
Revert "Reland 85013 - Split GLContext::Create*GLContext into GLSurface::Create*GLSurface plus a
surface type independent GLContext::CreateGLContext".
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85124 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); |