diff options
Diffstat (limited to 'src/gui/painting/qdrawingprimitive_sse2_p.h')
| -rw-r--r-- | src/gui/painting/qdrawingprimitive_sse2_p.h | 54 |
1 files changed, 9 insertions, 45 deletions
diff --git a/src/gui/painting/qdrawingprimitive_sse2_p.h b/src/gui/painting/qdrawingprimitive_sse2_p.h index cc8d230fa8..2233b73e56 100644 --- a/src/gui/painting/qdrawingprimitive_sse2_p.h +++ b/src/gui/painting/qdrawingprimitive_sse2_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QDRAWINGPRIMITIVE_SSE2_P_H #define QDRAWINGPRIMITIVE_SSE2_P_H @@ -64,7 +28,7 @@ QT_BEGIN_NAMESPACE * Multiply the components of pixelVector by alphaChannel * Each 32bits components of alphaChannel must be in the form 0x00AA00AA * colorMask must have 0x00ff00ff on each 32 bits component - * half must have the value 128 (0x80) for each 32 bits compnent + * half must have the value 128 (0x80) for each 32 bits component */ #define BYTE_MUL_SSE2(result, pixelVector, alphaChannel, colorMask, half) \ { \ @@ -102,7 +66,7 @@ QT_BEGIN_NAMESPACE * Each 32bits components of alphaChannel must be in the form 0x00AA00AA * oneMinusAlphaChannel must be 255 - alpha for each 32 bits component * colorMask must have 0x00ff00ff on each 32 bits component - * half must have the value 128 (0x80) for each 32 bits compnent + * half must have the value 128 (0x80) for each 32 bits component */ #define INTERPOLATE_PIXEL_255_SSE2(result, srcVector, dstVector, alphaChannel, oneMinusAlphaChannel, colorMask, half) { \ /* interpolate AG */\ @@ -232,7 +196,7 @@ QT_END_NAMESPACE QT_BEGIN_NAMESPACE #if QT_COMPILER_SUPPORTS_HERE(SSE4_1) QT_FUNCTION_TARGET(SSE2) -Q_ALWAYS_INLINE void Q_DECL_VECTORCALL reciprocal_mul_ss(__m128 &ia, const __m128 a, float mul) +static inline void Q_DECL_VECTORCALL reciprocal_mul_ss(__m128 &ia, const __m128 a, float mul) { ia = _mm_rcp_ss(a); // Approximate 1/a // Improve precision of ia using Newton-Raphson @@ -242,7 +206,7 @@ Q_ALWAYS_INLINE void Q_DECL_VECTORCALL reciprocal_mul_ss(__m128 &ia, const __m12 } QT_FUNCTION_TARGET(SSE4_1) -inline QRgb qUnpremultiply_sse4(QRgb p) +static inline QRgb qUnpremultiply_sse4(QRgb p) { const uint alpha = qAlpha(p); if (alpha == 255) @@ -262,14 +226,14 @@ inline QRgb qUnpremultiply_sse4(QRgb p) template<enum QtPixelOrder PixelOrder> QT_FUNCTION_TARGET(SSE4_1) -inline uint qConvertArgb32ToA2rgb30_sse4(QRgb p) +static inline uint qConvertArgb32ToA2rgb30_sse4(QRgb p) { const uint alpha = qAlpha(p); if (alpha == 255) return qConvertRgb32ToRgb30<PixelOrder>(p); if (alpha == 0) return 0; - Q_CONSTEXPR float mult = 1023.0f / (255 >> 6); + constexpr float mult = 1023.0f / (255 >> 6); const uint newalpha = (alpha >> 6); const __m128 va = _mm_set1_ps(alpha); __m128 via; @@ -292,7 +256,7 @@ inline uint qConvertArgb32ToA2rgb30_sse4(QRgb p) template<enum QtPixelOrder PixelOrder> QT_FUNCTION_TARGET(SSE4_1) -inline uint qConvertRgba64ToRgb32_sse4(QRgba64 p) +static inline uint qConvertRgba64ToRgb32_sse4(QRgba64 p) { if (p.isTransparent()) return 0; |