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

Unified Diff: gpu/demos/framework/window.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/demos.gyp ('k') | gpu/gles2_conform_support/egl/display.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/demos/framework/window.cc
===================================================================
--- gpu/demos/framework/window.cc (revision 137438)
+++ gpu/demos/framework/window.cc (working copy)
@@ -44,7 +44,7 @@
gles2_cmd_helper_.reset();
if (decoder_.get()) {
- decoder_->Destroy();
+ decoder_->Destroy(true);
}
}
@@ -70,7 +70,7 @@
return false;
}
- gpu::gles2::ContextGroup::Ref group(new gpu::gles2::ContextGroup(true));
+ gpu::gles2::ContextGroup::Ref group(new gpu::gles2::ContextGroup(NULL, true));
decoder_.reset(gpu::gles2::GLES2Decoder::Create(group.get()));
if (!decoder_.get())
@@ -91,6 +91,8 @@
if (!context_.get())
return false;
+ context_->MakeCurrent(surface_);
+
std::vector<int32> attribs;
if (!decoder_->Initialize(surface_.get(),
context_.get(),
« no previous file with comments | « gpu/demos/demos.gyp ('k') | gpu/gles2_conform_support/egl/display.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698