diff options
| author | Marc Mutz <[email protected]> | 2015-11-12 10:16:22 +0100 |
|---|---|---|
| committer | Marc Mutz <[email protected]> | 2015-11-29 22:59:17 +0000 |
| commit | 51089a5742a79467221b5781cb35a8cea023febf (patch) | |
| tree | 95f765fa452cdfaa12f986e4d228d9a958c95100 /src/gui/kernel/qopenglcontext.cpp | |
| parent | 14d189f7875b7def6f9745bfd20527a0fce19a44 (diff) | |
Use Q_UNLIKELY for every qFatal()/qCritical()
If, after checking a condition, we issue a qFatal()
or a qCritical(), by definition that check is
unlikely to be true.
Tell the compiler so it can move the error handling
code out of the normal code path to increase the
effective icache size.
Moved conditional code around where possible so that
we could always use Q_UNLIKELY, instead of having to
revert to Q_LIKELY here and there.
In some cases, simplified the expressions newly wrapped
in Q_UNLIKELY as a drive-by.
Change-Id: I67537d62b04bc6977d69254690c5ebbdf98bfd6d
Reviewed-by: Konstantin Ritt <[email protected]>
Reviewed-by: Olivier Goffart (Woboq GmbH) <[email protected]>
Diffstat (limited to 'src/gui/kernel/qopenglcontext.cpp')
| -rw-r--r-- | src/gui/kernel/qopenglcontext.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qopenglcontext.cpp b/src/gui/kernel/qopenglcontext.cpp index 85d05959def..3a51c2b7b24 100644 --- a/src/gui/kernel/qopenglcontext.cpp +++ b/src/gui/kernel/qopenglcontext.cpp @@ -948,7 +948,7 @@ bool QOpenGLContext::makeCurrent(QSurface *surface) if (!isValid()) return false; - if (thread() != QThread::currentThread()) + if (Q_UNLIKELY(thread() != QThread::currentThread())) qFatal("Cannot make QOpenGLContext current in a different thread"); if (!surface) { |