summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authornduca@chromium.org <nduca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-26 00:07:53 +0000
committernduca@chromium.org <nduca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-26 00:07:53 +0000
commitbc68aa1aa9b8f1d812f6ad55ca7fe19ad3c1705c (patch)
tree732ae45fb270c1e3ac96141a09a12c9b404ee5db /ui
parent88818bd788652c40dfc2500eb24f3a11a70bb134 (diff)
downloadchromium_src-bc68aa1aa9b8f1d812f6ad55ca7fe19ad3c1705c.zip
chromium_src-bc68aa1aa9b8f1d812f6ad55ca7fe19ad3c1705c.tar.gz
chromium_src-bc68aa1aa9b8f1d812f6ad55ca7fe19ad3c1705c.tar.bz2
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
Diffstat (limited to 'ui')
-rw-r--r--ui/gfx/gl/gl_context_cgl.cc2
-rw-r--r--ui/gfx/gl/gl_context_osmesa.cc2
-rw-r--r--ui/gfx/gl/gl_context_wgl.cc4
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";
}
}