Manually merging trunk revs 95836 and 96904 to 835 branch (third attempt, nacl should be fixed)

gpu/command_buffer/client/gles2_demo.cc

 // Copyright (c) 2011 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.
 
 // This file implements a standalone executable demo of using GLES2 over
 // command buffers. This code is temporary as the setup that happens
 // here is in a state of flux. Eventually there will be several versions of
 // setup, one for trusted code, one for pepper, one for NaCl, and maybe others.
 
 #include <windows.h>
 #include <windowsx.h>
 #include <shellapi.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/shared_memory.h"
+#include "gpu/command_buffer/service/context_group.h"
 #include "gpu/command_buffer/service/gpu_scheduler.h"
 #include "gpu/command_buffer/service/command_buffer_service.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "gpu/command_buffer/client/gles2_lib.h"
 #include "gpu/command_buffer/client/gles2_demo_c.h"
 #include "gpu/command_buffer/client/gles2_demo_cc.h"
 #include "ui/gfx/gl/gl_surface.h"
 
 using base::SharedMemory;
 using gpu::Buffer;
@@ skipping 17 matching lines @@
 };
 
 GLES2Demo::GLES2Demo() {
 }
 
 bool GLES2Demo::Setup(void* hwnd, int32 size) {
   scoped_ptr<CommandBufferService> command_buffer(new CommandBufferService);
   if (!command_buffer->Initialize(size))
     return NULL;
 
+  gpu::gles2::ContextGroup::Ref group(new gpu::gles2::ContextGroup(true));
   GpuScheduler* gpu_scheduler = GpuScheduler::Create(command_buffer.get(),
                                                      NULL,
                                                      NULL);
   if (!gpu_scheduler->Initialize(reinterpret_cast<HWND>(hwnd),
                                  gfx::Size(),
                                  false,
                                  gpu::gles2::DisallowedExtensions(),
                                  NULL,
                                  std::vector<int32>(),
                                  NULL)) {
@@ skipping 16 matching lines @@
       command_buffer->GetTransferBuffer(transfer_buffer_id);
   if (!transfer_buffer.ptr)
     return false;
 
 
   gles2::Initialize();
   gles2::SetGLContext(new GLES2Implementation(helper,
                                               transfer_buffer.size,
                                               transfer_buffer.ptr,
                                               transfer_buffer_id,
-                                              false));
+                                              false,
+                                              true));
 
   GLFromCPPInit();
 
   return command_buffer.release() != NULL;
 }
 
 #if defined(OS_WIN)
 LRESULT CALLBACK WindowProc(
     HWND hwnd, UINT msg, WPARAM w_param, LPARAM l_param) {
   switch (msg) {
@@ skipping 117 matching lines @@
     ::fprintf(stdout, "Could not setup window.\n");
     return EXIT_FAILURE;
   }
 
   demo->Setup(hwnd, kCommandBufferSize);
 
   ProcessMessages(hwnd);
 
   return EXIT_SUCCESS;
 }