diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-17 12:17:42 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-17 12:29:11 +0100 |
| commit | a2850e54d5ec7bc02c265459e3b8c8958df2e595 (patch) | |
| tree | 2a1e9940ad96387b8731d15d04ca6ae21892f091 /src/gui/painting/qdrawhelper_sse2.cpp | |
| parent | 8212e0cfad754d65146a21c95f38deaac8ffe8e1 (diff) | |
| parent | f15d9e6ccd006a2b47b50ae755fbe9534748a2eb (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Conflicts:
src/gui/painting/qdrawhelper.cpp
src/gui/painting/qdrawhelper_avx.cpp
src/gui/painting/qdrawhelper_x86_p.h
Change-Id: I09352d05119f6fd000319074a2705b38361b2c90
Diffstat (limited to 'src/gui/painting/qdrawhelper_sse2.cpp')
| -rw-r--r-- | src/gui/painting/qdrawhelper_sse2.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/gui/painting/qdrawhelper_sse2.cpp b/src/gui/painting/qdrawhelper_sse2.cpp index f5523f7113..c37858d679 100644 --- a/src/gui/painting/qdrawhelper_sse2.cpp +++ b/src/gui/painting/qdrawhelper_sse2.cpp @@ -476,6 +476,13 @@ void qt_bitmapblit32_sse2(QRasterBuffer *rasterBuffer, int x, int y, } } +void qt_bitmapblit8888_sse2(QRasterBuffer *rasterBuffer, int x, int y, + quint32 color, + const uchar *src, int width, int height, int stride) +{ + qt_bitmapblit32_sse2(rasterBuffer, x, y, ARGB2RGBA(color), src, width, height, stride); +} + void qt_bitmapblit16_sse2(QRasterBuffer *rasterBuffer, int x, int y, quint32 color, const uchar *src, int width, int height, int stride) |