Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(665)

Unified Diff: gpu/gles2_conform_support/egl/display.cc

Issue 10388131: Allow GLES2CmdDecoder to change the GLSurface associated with the default FBO. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/demos/framework/window.cc ('k') | gpu/gpu_common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/gles2_conform_support/egl/display.cc
===================================================================
--- gpu/gles2_conform_support/egl/display.cc (revision 137438)
+++ gpu/gles2_conform_support/egl/display.cc (working copy)
@@ -109,6 +109,8 @@
if (!gl_context_.get())
return EGL_NO_SURFACE;
+ gl_context_->MakeCurrent(gl_surface_);
+
std::vector<int32> attribs;
if (!decoder_->Initialize(gl_surface_.get(),
gl_context_.get(),
@@ -147,7 +149,7 @@
DCHECK(IsValidSurface(surface));
gpu_scheduler_.reset();
if (decoder_.get()) {
- decoder_->Destroy();
+ decoder_->Destroy(true);
}
decoder_.reset();
gl_surface_ = NULL;
« no previous file with comments | « gpu/demos/framework/window.cc ('k') | gpu/gpu_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698