diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-30 22:05:37 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-30 22:05:37 +0000 |
| commit | 818c8554ec0fc9688690c1c29cbf713268e33568 (patch) | |
| tree | c223a0d7f476212cae6848cf34a89f3eac24f5af /cc/test/layer_tree_pixel_test.cc | |
| parent | 2a6156dc5ebee4b091022603cb9250a67ef005d9 (diff) | |
| download | chromium_src-818c8554ec0fc9688690c1c29cbf713268e33568.zip chromium_src-818c8554ec0fc9688690c1c29cbf713268e33568.tar.gz chromium_src-818c8554ec0fc9688690c1c29cbf713268e33568.tar.bz2 | |
Ensure GL initialization only happens once, and provide common init path
Currently tests initialize GL by calling into methods that should be
internal to the gl bindings code. Instead, everyone should go through
GLSurface::InitializeOneOff.
Also GLSurface::InitializeOneOff early outs if it was already called,
leading to a pattern of initializing GL all over the place just in case
and not having a clear idea of where it should be set up. Instead, DCHECK
that it is not called more than once, and move calls to this method to
be during process startup for unit test suites instead of mid-test.
This adds two test variants of InitializeOneOff for tests to call, that
set up OSMesa or Mock GL bindings, via GLSurface::InitializeOneOff.
R=piman, sievers
BUG=270918
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=247793
Review URL: https://codereview.chromium.org/135213003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248049 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test/layer_tree_pixel_test.cc')
| -rw-r--r-- | cc/test/layer_tree_pixel_test.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/cc/test/layer_tree_pixel_test.cc b/cc/test/layer_tree_pixel_test.cc index c5d2125..2792f66 100644 --- a/cc/test/layer_tree_pixel_test.cc +++ b/cc/test/layer_tree_pixel_test.cc @@ -21,7 +21,6 @@ #include "cc/trees/layer_tree_impl.h" #include "gpu/command_buffer/client/gl_in_process_context.h" #include "gpu/command_buffer/client/gles2_implementation.h" -#include "ui/gl/gl_implementation.h" using gpu::gles2::GLES2Interface; @@ -55,8 +54,6 @@ scoped_ptr<OutputSurface> LayerTreePixelTest::CreateOutputSurface( case GL_WITH_DEFAULT: case GL_WITH_BITMAP: { - CHECK(gfx::InitializeStaticGLBindings(gfx::kGLImplementationOSMesaGL)); - output_surface = make_scoped_ptr( new PixelTestOutputSurface(new TestInProcessContextProvider)); break; @@ -316,8 +313,6 @@ void LayerTreePixelTest::CopyBitmapToTextureMailboxAsTexture( DCHECK_GT(bitmap.width(), 0); DCHECK_GT(bitmap.height(), 0); - CHECK(gfx::InitializeStaticGLBindings(gfx::kGLImplementationOSMesaGL)); - scoped_ptr<gpu::GLInProcessContext> context = CreateTestInProcessContext(); GLES2Interface* gl = context->GetImplementation(); |