Index: ui/gl/gl_fence.cc |
diff --git a/ui/gl/gl_fence.cc b/ui/gl/gl_fence.cc |
index c254411232339f2c29064ec73d37857bb3f70037..0fb3a743309c588cf688e13915b83a420179b0c3 100644 |
--- a/ui/gl/gl_fence.cc |
+++ b/ui/gl/gl_fence.cc |
@@ -19,35 +19,6 @@ |
namespace gfx { |
-namespace { |
- |
-// static |
-GLFence* CreateFence(bool flush) { |
- DCHECK(GLContext::GetCurrent()) |
- << "Trying to create fence with no context"; |
- |
- scoped_ptr<GLFence> fence; |
- // Prefer ARB_sync which supports server-side wait. |
- if (g_driver_gl.ext.b_GL_ARB_sync || |
- GetGLVersionInfo()->is_es3) { |
- fence.reset(new GLFenceARB(flush)); |
-#if defined(OS_MACOSX) |
- } else if (g_driver_gl.ext.b_GL_APPLE_fence) { |
- fence.reset(new GLFenceAPPLE(flush)); |
-#else |
- } else if (g_driver_egl.ext.b_EGL_KHR_fence_sync) { |
- fence.reset(new GLFenceEGL(flush)); |
-#endif |
- } else if (g_driver_gl.ext.b_GL_NV_fence) { |
- fence.reset(new GLFenceNV(flush)); |
- } |
- |
- DCHECK_EQ(!!fence.get(), GLFence::IsSupported()); |
- return fence.release(); |
-} |
- |
-} // namespace |
- |
GLFence::GLFence() { |
} |
@@ -66,11 +37,27 @@ bool GLFence::IsSupported() { |
} |
GLFence* GLFence::Create() { |
- return CreateFence(true); |
-} |
+ DCHECK(GLContext::GetCurrent()) |
+ << "Trying to create fence with no context"; |
-GLFence* GLFence::CreateWithoutFlush() { |
- return CreateFence(false); |
+ scoped_ptr<GLFence> fence; |
+ // Prefer ARB_sync which supports server-side wait. |
+ if (g_driver_gl.ext.b_GL_ARB_sync || |
+ GetGLVersionInfo()->is_es3) { |
+ fence.reset(new GLFenceARB); |
+#if defined(OS_MACOSX) |
+ } else if (g_driver_gl.ext.b_GL_APPLE_fence) { |
+ fence.reset(new GLFenceAPPLE); |
+#else |
+ } else if (g_driver_egl.ext.b_EGL_KHR_fence_sync) { |
+ fence.reset(new GLFenceEGL); |
+#endif |
+ } else if (g_driver_gl.ext.b_GL_NV_fence) { |
+ fence.reset(new GLFenceNV); |
+ } |
+ |
+ DCHECK_EQ(!!fence.get(), GLFence::IsSupported()); |
+ return fence.release(); |
} |
} // namespace gfx |