diff options
| author | mazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-10 16:53:25 +0000 |
|---|---|---|
| committer | mazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-10 16:53:25 +0000 |
| commit | 3349dcf407b0d41d1b540de15f721ed247cbf550 (patch) | |
| tree | 496e6feb9957ed6c3c1ebe7e1d2657c6e5c423af /gpu/gles2_conform_support/egl | |
| parent | 970b68c5c7d24f444633a2f3fbe0465cfb863081 (diff) | |
| download | chromium_src-3349dcf407b0d41d1b540de15f721ed247cbf550.zip chromium_src-3349dcf407b0d41d1b540de15f721ed247cbf550.tar.gz chromium_src-3349dcf407b0d41d1b540de15f721ed247cbf550.tar.bz2 | |
Revert 131177 - aura: Change shared context to be offscreen for arm
This change causes Chrome OS to get stuck in the login screen on Lumpy and Stumpy, so it is reverted for now.
BUG=chrome-os-partner:8831
TEST=Manually checked that I can log in successfully
ARM drivers don't like to have 2 EGLSurface on the same Window. So we need to
make the UI shared context offscren.
This also requires the image transport surface to be an "offscreen" GLSurface (a
pbuffer), however the GLES2Decoder needs to be "onscreen" (i.e. it calls
SwapBuffers on the surface instead managing the offscreen buffers itself).
So this decouples the 2 notions of "offscreen".
BUG=chrome-os-partner:8284
TEST=gpu_unittests. Aura chrome --ui-use-gpu-process with poster circle and webgl on tegra, lumpy, desktop GL. Desktop chrome with poster circle and webgl.
Review URL: http://codereview.chromium.org/10007034
TBR=piman@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10031036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131559 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/gles2_conform_support/egl')
| -rw-r--r-- | gpu/gles2_conform_support/egl/display.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gpu/gles2_conform_support/egl/display.cc b/gpu/gles2_conform_support/egl/display.cc index bc07fae..d3dbc08 100644 --- a/gpu/gles2_conform_support/egl/display.cc +++ b/gpu/gles2_conform_support/egl/display.cc @@ -112,7 +112,6 @@ EGLSurface Display::CreateWindowSurface(EGLConfig config, std::vector<int32> attribs; if (!decoder_->Initialize(gl_surface_.get(), gl_context_.get(), - gl_surface_->IsOffscreen(), gfx::Size(), gpu::gles2::DisallowedFeatures(), NULL, |