diff options
| author | kkinnunen <kkinnunen@nvidia.com> | 2015-10-26 09:26:01 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-26 16:26:55 +0000 |
| commit | 213e490b733180b643600217e0fdc39e596b109a (patch) | |
| tree | 6d6da06191800dc1da41f6b36459f09db66a6132 /gpu/gles2_conform_support | |
| parent | db1d9ecccc0a59264de89067cb1ff354e42faeed (diff) | |
| download | chromium_src-213e490b733180b643600217e0fdc39e596b109a.zip chromium_src-213e490b733180b643600217e0fdc39e596b109a.tar.gz chromium_src-213e490b733180b643600217e0fdc39e596b109a.tar.bz2 | |
Support multiple contexts in command_buffer_gles2
Fix problems with multiple contexts when using command_buffer_gles2
library.
Rendering to two different command_buffer_gles2-provided contexts would
not work, as the last created native context would remain current.
Also fixes a problem with Skia, where Skia would create and use a GLX
context directly, as well as using command_buffer_gles2 context.
BUG=skia:2992
Review URL: https://codereview.chromium.org/1416043005
Cr-Commit-Position: refs/heads/master@{#356058}
Diffstat (limited to 'gpu/gles2_conform_support')
| -rw-r--r-- | gpu/gles2_conform_support/egl/display.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/gpu/gles2_conform_support/egl/display.cc b/gpu/gles2_conform_support/egl/display.cc index 2d2cffb..fb43272 100644 --- a/gpu/gles2_conform_support/egl/display.cc +++ b/gpu/gles2_conform_support/egl/display.cc @@ -276,6 +276,7 @@ bool Display::MakeCurrent(EGLSurface draw, EGLSurface read, EGLContext ctx) { DCHECK(IsValidSurface(read)); DCHECK(IsValidContext(ctx)); gles2::SetGLContext(context_.get()); + gl_context_->MakeCurrent(gl_surface_.get()); } return true; } |