diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-12 22:54:29 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-12 22:54:29 +0000 |
| commit | ffae402c58ea5e0787208ccdcd60b0f021b7ebd2 (patch) | |
| tree | 0fdcbd1873b6a76b47d3074976a8e9f07b9d68ed /gpu/command_buffer/client | |
| parent | 8d9591d65ffcd08c5f69f5bb231f9c08a1f7042a (diff) | |
| download | chromium_src-ffae402c58ea5e0787208ccdcd60b0f021b7ebd2.zip chromium_src-ffae402c58ea5e0787208ccdcd60b0f021b7ebd2.tar.gz chromium_src-ffae402c58ea5e0787208ccdcd60b0f021b7ebd2.tar.bz2 | |
Reland 85013 - Split GLContext::Create*GLContext into GLSurface::Create*GLSurface plus a
surface type independent GLContext::CreateGLContext
TEST=try, including layout tests
BUG=none
Review URL: http://codereview.chromium.org/7013037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85207 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer/client')
| -rw-r--r-- | gpu/command_buffer/client/gles2_demo.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gpu/command_buffer/client/gles2_demo.cc b/gpu/command_buffer/client/gles2_demo.cc index 54a3b89..78768dd 100644 --- a/gpu/command_buffer/client/gles2_demo.cc +++ b/gpu/command_buffer/client/gles2_demo.cc @@ -25,7 +25,7 @@ #include "gpu/command_buffer/client/gles2_lib.h" #include "gpu/command_buffer/client/gles2_demo_c.h" #include "gpu/command_buffer/client/gles2_demo_cc.h" -#include "ui/gfx/gl/gl_context.h" +#include "ui/gfx/gl/gl_surface.h" using base::SharedMemory; using gpu::Buffer; @@ -212,7 +212,7 @@ int main(int argc, char** argv) { base::AtExitManager at_exit_manager; MessageLoopForUI message_loop; - gfx::GLContext::InitializeOneOff(); + gfx::GLSurface::InitializeOneOff(); GLES2Demo* demo = new GLES2Demo(); |