summaryrefslogtreecommitdiffstats
path: root/src/gui/painting/qdrawhelper_x86_p.h
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2014-03-17 12:17:42 +0100
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2014-03-17 12:29:11 +0100
commita2850e54d5ec7bc02c265459e3b8c8958df2e595 (patch)
tree2a1e9940ad96387b8731d15d04ca6ae21892f091 /src/gui/painting/qdrawhelper_x86_p.h
parent8212e0cfad754d65146a21c95f38deaac8ffe8e1 (diff)
parentf15d9e6ccd006a2b47b50ae755fbe9534748a2eb (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_x86_p.h')
-rw-r--r--src/gui/painting/qdrawhelper_x86_p.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/painting/qdrawhelper_x86_p.h b/src/gui/painting/qdrawhelper_x86_p.h
index 699c586cb0..97c1f87c2a 100644
--- a/src/gui/painting/qdrawhelper_x86_p.h
+++ b/src/gui/painting/qdrawhelper_x86_p.h
@@ -63,6 +63,9 @@ void qt_memfill16(quint16 *dest, quint16 value, int count);
void qt_bitmapblit32_sse2(QRasterBuffer *rasterBuffer, int x, int y,
quint32 color,
const uchar *src, int width, int height, int stride);
+void qt_bitmapblit8888_sse2(QRasterBuffer *rasterBuffer, int x, int y,
+ quint32 color,
+ const uchar *src, int width, int height, int stride);
void qt_bitmapblit16_sse2(QRasterBuffer *rasterBuffer, int x, int y,
quint32 color,
const uchar *src, int width, int height, int stride);