diff options
| author | ccameron <ccameron@chromium.org> | 2015-11-05 13:36:08 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-05 21:37:23 +0000 |
| commit | 3b6faef813a8178b96102fd227d618832244b5fa (patch) | |
| tree | e7723dac70f14b4d20c9586e5184ff490014d34b | |
| parent | fdf0a2e6770d442569859ac99bb47700e97c42d4 (diff) | |
| download | chromium_src-3b6faef813a8178b96102fd227d618832244b5fa.zip chromium_src-3b6faef813a8178b96102fd227d618832244b5fa.tar.gz chromium_src-3b6faef813a8178b96102fd227d618832244b5fa.tar.bz2 | |
Fix GLFence when using core profile
BUG=551483
Review URL: https://codereview.chromium.org/1418423011
Cr-Commit-Position: refs/heads/master@{#358135}
| -rw-r--r-- | ui/gl/gl_fence.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ui/gl/gl_fence.cc b/ui/gl/gl_fence.cc index 0fb3a74..694f22d 100644 --- a/ui/gl/gl_fence.cc +++ b/ui/gl/gl_fence.cc @@ -11,6 +11,7 @@ #include "ui/gl/gl_fence_egl.h" #include "ui/gl/gl_fence_nv.h" #include "ui/gl/gl_gl_api_implementation.h" +#include "ui/gl/gl_implementation.h" #include "ui/gl/gl_version_info.h" #if defined(OS_MACOSX) @@ -28,6 +29,7 @@ GLFence::~GLFence() { bool GLFence::IsSupported() { DCHECK(GetGLVersionInfo()); return 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 || #else @@ -43,7 +45,8 @@ GLFence* GLFence::Create() { scoped_ptr<GLFence> fence; // Prefer ARB_sync which supports server-side wait. if (g_driver_gl.ext.b_GL_ARB_sync || - GetGLVersionInfo()->is_es3) { + GetGLVersionInfo()->is_es3 || + GetGLImplementation() == kGLImplementationDesktopGLCoreProfile) { fence.reset(new GLFenceARB); #if defined(OS_MACOSX) } else if (g_driver_gl.ext.b_GL_APPLE_fence) { |