diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2010-12-15 11:41:08 (GMT) |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2010-12-15 11:57:34 (GMT) |
| commit | e0aa9897bc2d04054cc65dbe3452bee2ed2eacd8 (patch) | |
| tree | 3ff5438efd21783ca98b6209f44503da254abc6b /src/gui | |
| parent | af5984ef163894b6eb43894aa4075e947642bb6d (diff) | |
| download | Qt-e0aa9897bc2d04054cc65dbe3452bee2ed2eacd8.zip Qt-e0aa9897bc2d04054cc65dbe3452bee2ed2eacd8.tar.gz Qt-e0aa9897bc2d04054cc65dbe3452bee2ed2eacd8.tar.bz2 | |
Prevent crash in drawhelper code when the cpu has MMXEXT but no SSE.
We can't use the qdrawhelper_sse.cpp or qdrawhelper_sse3dnow.cpp when
SSE is not run-time detected, as those are compiled with -msse and
MMXEXT is just a subset of SSE. The compiler might choose to use an
instruction not in the subset, causing a crash at run-time.
Task-number: QTBUG-15693
Reviewed-by: Thiago Macieira
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/painting/qdrawhelper.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp index 024a69d..62af212 100644 --- a/src/gui/painting/qdrawhelper.cpp +++ b/src/gui/painting/qdrawhelper.cpp @@ -7711,17 +7711,6 @@ void qInitDrawhelperAsm() } #endif #endif // SSE -#if defined(QT_HAVE_MMXEXT) && defined(QT_HAVE_SSE) - } else if (features & MMXEXT) { - qt_memfill32 = qt_memfill32_sse; - qDrawHelper[QImage::Format_RGB16].bitmapBlit = qt_bitmapblit16_sse; -# ifdef QT_HAVE_3DNOW - if (features & MMX3DNOW) { - qt_memfill32 = qt_memfill32_sse3dnow; - qDrawHelper[QImage::Format_RGB16].bitmapBlit = qt_bitmapblit16_sse3dnow; - } -# endif // 3DNOW -#endif // MMXEXT } #ifdef QT_HAVE_MMX if (features & MMX) { |