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

Unified Diff: ui/gl/gl_fence.cc

Issue 1697833002: noop fence Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 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.gyp ('k') | ui/gl/gl_fence_noop.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 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 ||
« no previous file with comments | « ui/gl/gl.gyp ('k') | ui/gl/gl_fence_noop.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698