Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(152)

Unified Diff: ui/gl/gl_fence.cc

Issue 1061733002: Remove windows/mac/ios specific code from //ui (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: fix default try set Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gl/gl_context_win.cc ('k') | ui/gl/gl_fence_apple.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_fence.cc
diff --git a/ui/gl/gl_fence.cc b/ui/gl/gl_fence.cc
index 0fb3a743309c588cf688e13915b83a420179b0c3..c119aa0111e28df229128f64d6321be171744c77 100644
--- a/ui/gl/gl_fence.cc
+++ b/ui/gl/gl_fence.cc
@@ -13,10 +13,6 @@
#include "ui/gl/gl_gl_api_implementation.h"
#include "ui/gl/gl_version_info.h"
-#if defined(OS_MACOSX)
-#include "ui/gl/gl_fence_apple.h"
-#endif
-
namespace gfx {
GLFence::GLFence() {
@@ -28,11 +24,7 @@ GLFence::~GLFence() {
bool GLFence::IsSupported() {
DCHECK(GetGLVersionInfo());
return g_driver_gl.ext.b_GL_ARB_sync || GetGLVersionInfo()->is_es3 ||
-#if defined(OS_MACOSX)
- g_driver_gl.ext.b_GL_APPLE_fence ||
-#else
g_driver_egl.ext.b_EGL_KHR_fence_sync ||
-#endif
g_driver_gl.ext.b_GL_NV_fence;
}
@@ -45,13 +37,8 @@ GLFence* GLFence::Create() {
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);
}
« no previous file with comments | « ui/gl/gl_context_win.cc ('k') | ui/gl/gl_fence_apple.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698