From bc68aa1aa9b8f1d812f6ad55ca7fe19ad3c1705c Mon Sep 17 00:00:00 2001 From: "nduca@chromium.org" Date: Thu, 26 May 2011 00:07:53 +0000 Subject: Make SetSwapInterval a log warning rather than a notreached. TBR=apatrick@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86749 0039d316-1c4b-4281-b951-d872f2087c98 --- ui/gfx/gl/gl_context_cgl.cc | 2 +- ui/gfx/gl/gl_context_osmesa.cc | 2 +- ui/gfx/gl/gl_context_wgl.cc | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ui/gfx/gl/gl_context_cgl.cc b/ui/gfx/gl/gl_context_cgl.cc index cb2853b..8d3d819 100644 --- a/ui/gfx/gl/gl_context_cgl.cc +++ b/ui/gfx/gl/gl_context_cgl.cc @@ -102,7 +102,7 @@ void* GLContextCGL::GetHandle() { void GLContextCGL::SetSwapInterval(int interval) { DCHECK(IsCurrent(NULL)); - NOTREACHED() << "Attempt to call SetSwapInterval on a GLContextCGL."; + LOG(WARNING) << "GLContex: GLContextCGL::SetSwapInterval is ignored."; } } // namespace gfx diff --git a/ui/gfx/gl/gl_context_osmesa.cc b/ui/gfx/gl/gl_context_osmesa.cc index 4466fd3..5fe5150 100644 --- a/ui/gfx/gl/gl_context_osmesa.cc +++ b/ui/gfx/gl/gl_context_osmesa.cc @@ -102,7 +102,7 @@ void* GLContextOSMesa::GetHandle() { void GLContextOSMesa::SetSwapInterval(int interval) { DCHECK(IsCurrent(NULL)); - NOTREACHED() << "Attempt to call SetSwapInterval on an GLContextOSMesa."; + LOG(WARNING) << "GLContextOSMesa::SetSwapInterval is ignored."; } } // namespace gfx diff --git a/ui/gfx/gl/gl_context_wgl.cc b/ui/gfx/gl/gl_context_wgl.cc index 44825c5..7df8772 100644 --- a/ui/gfx/gl/gl_context_wgl.cc +++ b/ui/gfx/gl/gl_context_wgl.cc @@ -111,6 +111,10 @@ void GLContextWGL::SetSwapInterval(int interval) { DCHECK(IsCurrent(NULL)); if (HasExtension("WGL_EXT_swap_control") && wglSwapIntervalEXT) { wglSwapIntervalEXT(interval); + } else { + LOG(WARNING) << + "Could not disable vsync: driver does not " + "support WGL_EXT_swap_control"; } } -- cgit v1.1