Commit baa90006 authored by backer@chromium.org's avatar backer@chromium.org

GpuInfoCollector needs to initialize gl_bindings.

Fixes a case where GpuInfoCollector may call a glX function without initializing the bindings.

BUG=fixes NOTREACHED on touchui build in accelerated_surface_container_touch.cc
TEST=none

Review URL: http://codereview.chromium.org/7607004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96068 0039d316-1c4b-4281-b951-d872f2087c98
parent 630817f1
......@@ -18,6 +18,7 @@
#include "ui/gfx/gl/gl_bindings.h"
#include "ui/gfx/gl/gl_context.h"
#include "ui/gfx/gl/gl_implementation.h"
#include "ui/gfx/gl/gl_surface.h"
#include "ui/gfx/gl/gl_switches.h"
namespace {
......@@ -211,6 +212,11 @@ bool CollectGraphicsInfo(GPUInfo* gpu_info) {
bool CollectPreliminaryGraphicsInfo(GPUInfo* gpu_info) {
DCHECK(gpu_info);
if (!gfx::GLSurface::InitializeOneOff()) {
LOG(ERROR) << "gfx::GLContext::InitializeOneOff() failed";
return false;
}
bool rt = true;
if (!CollectVideoCardInfo(gpu_info))
rt = false;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment