Allow GLES2CmdDecoder to change the GLSurface associated with the default FBO.

gpu/demos/framework/window.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "gpu/demos/framework/window.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 26 matching lines @@
 
 Window::~Window() {
   demo_.reset();
 
   // must free client before service.
   gles2_implementation_.reset();
   transfer_buffer_.reset();
   gles2_cmd_helper_.reset();
 
   if (decoder_.get()) {
-    decoder_->Destroy();
+    decoder_->Destroy(true);
   }
 }
 
 bool Window::Init(int width, int height) {
   window_handle_ = CreateNativeWindow(demo_->Title(), width, height);
   if (window_handle_ == NULL)
     return false;
   if (!CreateRenderContext(PluginWindow(window_handle_)))
     return false;
 
   demo_->Resize(width, height);
   return demo_->InitGL();
 }
 
 void Window::OnPaint() {
   demo_->Draw();
   ::gles2::GetGLContext()->SwapBuffers();
 }
 
 bool Window::CreateRenderContext(gfx::AcceleratedWidget hwnd) {
   command_buffer_.reset(new CommandBufferService);
   if (!command_buffer_->Initialize()) {
     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())
     return false;
 
   gpu_scheduler_.reset(new gpu::GpuScheduler(command_buffer_.get(),
                                              decoder_.get(),
                                              NULL));
 
   decoder_->set_engine(gpu_scheduler_.get());
 
   surface_ = gfx::GLSurface::CreateViewGLSurface(false, hwnd);
   if (!surface_.get())
     return false;
 
   context_ = gfx::GLContext::CreateGLContext(
       NULL, surface_.get(), gfx::PreferDiscreteGpu);
   if (!context_.get())
     return false;
 
+  context_->MakeCurrent(surface_);
+
   std::vector<int32> attribs;
   if (!decoder_->Initialize(surface_.get(),
                             context_.get(),
                             surface_->IsOffscreen(),
                             gfx::Size(),
                             gpu::gles2::DisallowedFeatures(),
                             NULL,
                             attribs)) {
     return false;
   }
@@ skipping 26 matching lines @@
       kTransferBufferSize,
       kTransferBufferSize)) {
     return false;
   }
 
   return true;
 }
 
 }  // namespace demos
 }  // namespace gpu