diff options
author | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-30 02:06:08 +0000 |
---|---|---|
committer | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-30 02:06:08 +0000 |
commit | 64437e622c11f77938e41b473bd77421ec2482e1 (patch) | |
tree | 09baeeb57cf7f5d40829051c1d75adb58c7e9393 /cc/test/pixel_test.cc | |
parent | cb99348010b1e026f4ef4c0d242434731e497dca (diff) | |
download | chromium_src-64437e622c11f77938e41b473bd77421ec2482e1.zip chromium_src-64437e622c11f77938e41b473bd77421ec2482e1.tar.gz chromium_src-64437e622c11f77938e41b473bd77421ec2482e1.tar.bz2 |
Revert 247793 "Ensure GL initialization only happens once, and p..."
due to new static initializers in gl_bindings_autogen_gl.cc
> 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
>
> Review URL: https://codereview.chromium.org/135213003
TBR=danakj@chromium.org
Review URL: https://codereview.chromium.org/149953003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247811 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test/pixel_test.cc')
-rw-r--r-- | cc/test/pixel_test.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cc/test/pixel_test.cc b/cc/test/pixel_test.cc index 38a2b54..e84540e 100644 --- a/cc/test/pixel_test.cc +++ b/cc/test/pixel_test.cc @@ -23,6 +23,7 @@ #include "cc/test/pixel_test_utils.h" #include "cc/test/test_in_process_context_provider.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/gl/gl_implementation.h" namespace cc { @@ -117,6 +118,8 @@ bool PixelTest::PixelsMatchReference(const base::FilePath& ref_file, } void PixelTest::SetUpGLRenderer(bool use_skia_gpu_backend) { + CHECK(gfx::InitializeStaticGLBindings(gfx::kGLImplementationOSMesaGL)); + output_surface_.reset( new PixelTestOutputSurface(new TestInProcessContextProvider)); output_surface_->BindToClient(output_surface_client_.get()); |