Pass initial size and GPU preference via context attributes

gpu/command_buffer/tests/gl_manager.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/command_buffer/tests/gl_manager.h"
 
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 #include <GLES2/gl2extchromium.h>
 #include <stddef.h>
@@ skipping 261 matching lines @@
 
   gl::GLContext* real_gl_context = NULL;
   if (options.virtual_manager) {
     real_gl_context = options.virtual_manager->context();
   }
 
   mailbox_manager_ =
       mailbox_manager ? mailbox_manager : new gles2::MailboxManagerImpl;
   share_group_ = share_group ? share_group : new gl::GLShareGroup;
 
-  gl::GpuPreference gpu_preference(gl::PreferDiscreteGpu);
   gles2::ContextCreationAttribHelper attribs;
   attribs.red_size = 8;
   attribs.green_size = 8;
   attribs.blue_size = 8;
   attribs.alpha_size = 8;
   attribs.depth_size = 16;
   attribs.stencil_size = 8;
   attribs.context_type = options.context_type;
   attribs.samples = options.multisampled ? 4 : 0;
   attribs.sample_buffers = options.multisampled ? 1 : 0;
   attribs.alpha_size = options.backbuffer_alpha ? 8 : 0;
   attribs.should_use_native_gmb_for_backbuffer =
       options.image_factory != nullptr;
+  attribs.offscreen_framebuffer_size = options.size;
 
   if (!context_group) {
     GpuDriverBugWorkarounds gpu_driver_bug_workaround(&command_line);
     scoped_refptr<gles2::FeatureInfo> feature_info =
         new gles2::FeatureInfo(command_line, gpu_driver_bug_workaround);
     if (options.enable_arb_texture_rectangle) {
       gles2::FeatureInfo::FeatureFlags& flags =
           const_cast<gles2::FeatureInfo::FeatureFlags&>(
               feature_info->feature_flags());
       flags.arb_texture_rectangle = true;
@@ skipping 16 matching lines @@
                                       decoder_.get()));
 
   decoder_->set_engine(executor_.get());
 
   surface_ = gl::init::CreateOffscreenGLSurface(gfx::Size());
   ASSERT_TRUE(surface_.get() != NULL) << "could not create offscreen surface";
 
   if (base_context_) {
     context_ = scoped_refptr<gl::GLContext>(new gpu::GLContextVirtual(
         share_group_.get(), base_context_->get(), decoder_->AsWeakPtr()));
-    ASSERT_TRUE(context_->Initialize(surface_.get(), gl::PreferIntegratedGpu));
+    ASSERT_TRUE(context_->Initialize(surface_.get(), attribs.gpu_preference));
   } else {
     if (real_gl_context) {
       context_ = scoped_refptr<gl::GLContext>(new gpu::GLContextVirtual(
           share_group_.get(), real_gl_context, decoder_->AsWeakPtr()));
       ASSERT_TRUE(
-          context_->Initialize(surface_.get(), gl::PreferIntegratedGpu));
+          context_->Initialize(surface_.get(), attribs.gpu_preference));
     } else {
       context_ = gl::init::CreateGLContext(share_group_.get(), surface_.get(),
-                                           gpu_preference);
+                                           attribs.gpu_preference);
     }
   }
   ASSERT_TRUE(context_.get() != NULL) << "could not create GL context";
 
   ASSERT_TRUE(context_->MakeCurrent(surface_.get()));
 
-  if (!decoder_->Initialize(surface_.get(), context_.get(), true, options.size,
+  if (!decoder_->Initialize(surface_.get(), context_.get(), true,
                             ::gpu::gles2::DisallowedFeatures(), attribs)) {
     return;
   }
 
   if (options.sync_point_manager) {
     sync_point_manager_ = options.sync_point_manager;
     sync_point_order_data_ = SyncPointOrderData::Create();
     sync_point_client_ = sync_point_manager_->CreateSyncPointClient(
         sync_point_order_data_, GetNamespaceID(), GetCommandBufferID());
 
@@ skipping 294 matching lines @@
 
   // Something went wrong, just run the callback now.
   callback.Run();
 }
 
 bool GLManager::CanWaitUnverifiedSyncToken(const gpu::SyncToken* sync_token) {
   return false;
 }
 
 }  // namespace gpu