From e61fce02c8f7f8b839b47d6a9af8caf5fb4b44de Mon Sep 17 00:00:00 2001 From: Wyatt Radkiewicz Date: Mon, 7 Aug 2023 16:34:47 -0700 Subject: [PATCH] GRAPHICS: Fix blend blit indentation --- graphics/blit/blit-avx2.cpp | 2 +- graphics/blit/blit-sse2.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/graphics/blit/blit-avx2.cpp b/graphics/blit/blit-avx2.cpp index d06a0ab310e..b7768457a97 100644 --- a/graphics/blit/blit-avx2.cpp +++ b/graphics/blit/blit-avx2.cpp @@ -277,7 +277,7 @@ void BlendBlitImpl::blitInnerLoopAVX2(BlendBlit::Args &args) { int scaleXCtr, scaleYCtr = args.scaleYoff; const byte *inBase; - if (!doscale && (args.flipping & FLIP_H)) args.ino -= 4 * 7; + if (!doscale && (args.flipping & FLIP_H)) args.ino -= 4 * 7; for (uint32 i = 0; i < args.height; i++) { if (doscale) { diff --git a/graphics/blit/blit-sse2.cpp b/graphics/blit/blit-sse2.cpp index 1925490bdaa..c1b15c14354 100644 --- a/graphics/blit/blit-sse2.cpp +++ b/graphics/blit/blit-sse2.cpp @@ -98,14 +98,14 @@ struct AlphaBlend { template struct MultiplyBlend { static inline __m128i simd(__m128i src, __m128i dst, const bool flip, const byte ca, const byte cr, const byte cg, const byte cb) { - __m128i ina; - if (alphamod) + __m128i ina; + if (alphamod) ina = _mm_srli_epi32(_mm_mullo_epi16(_mm_and_si128(src, _mm_set1_epi32(BlendBlit::kAModMask)), _mm_set1_epi32(ca)), 8); - else + else ina = _mm_and_si128(src, _mm_set1_epi32(BlendBlit::kAModMask)); - __m128i alphaMask = _mm_cmpeq_epi32(ina, _mm_setzero_si128()); + __m128i alphaMask = _mm_cmpeq_epi32(ina, _mm_setzero_si128()); - if (rgbmod) { + if (rgbmod) { __m128i srcb = _mm_srli_epi32(_mm_and_si128(src, _mm_set1_epi32(BlendBlit::kBModMask)), BlendBlit::kBModShift); __m128i srcg = _mm_srli_epi32(_mm_and_si128(src, _mm_set1_epi32(BlendBlit::kGModMask)), BlendBlit::kGModShift); __m128i srcr = _mm_srli_epi32(_mm_and_si128(src, _mm_set1_epi32(BlendBlit::kRModMask)), BlendBlit::kRModShift);