| Index: ui/gl/gl_fence.cc
|
| diff --git a/ui/gl/gl_fence.cc b/ui/gl/gl_fence.cc
|
| index 62f098c2a834cb0f7a289fd8e756a75c3055935c..57a100c0bb4a3cf09e18bdb987a75096e449a2a0 100644
|
| --- a/ui/gl/gl_fence.cc
|
| +++ b/ui/gl/gl_fence.cc
|
| @@ -10,6 +10,7 @@
|
| #include "ui/gl/gl_context.h"
|
| #include "ui/gl/gl_fence_arb.h"
|
| #include "ui/gl/gl_fence_egl.h"
|
| +#include "ui/gl/gl_fence_noop.h"
|
| #include "ui/gl/gl_fence_nv.h"
|
| #include "ui/gl/gl_gl_api_implementation.h"
|
| #include "ui/gl/gl_implementation.h"
|
| @@ -29,7 +30,8 @@ GLFence::~GLFence() {
|
|
|
| bool GLFence::IsSupported() {
|
| DCHECK(GetGLVersionInfo());
|
| - return g_driver_gl.ext.b_GL_ARB_sync || GetGLVersionInfo()->is_es3 ||
|
| + return true ||
|
| + g_driver_gl.ext.b_GL_ARB_sync || GetGLVersionInfo()->is_es3 ||
|
| GetGLImplementation() == kGLImplementationDesktopGLCoreProfile ||
|
| #if defined(OS_MACOSX)
|
| g_driver_gl.ext.b_GL_APPLE_fence ||
|
| @@ -43,7 +45,7 @@ GLFence* GLFence::Create() {
|
| DCHECK(GLContext::GetCurrent())
|
| << "Trying to create fence with no context";
|
|
|
| - scoped_ptr<GLFence> fence;
|
| + scoped_ptr<GLFence> fence(new GLFenceNoop);
|
| // Prefer ARB_sync which supports server-side wait.
|
| if (g_driver_gl.ext.b_GL_ARB_sync ||
|
| GetGLVersionInfo()->is_es3 ||
|
|
|