Changeset - r21165:3d5ac52fd0b7
[Not reviewed]
master
0 4 0
rubidium - 10 years ago 2014-01-13 18:00:18
rubidium@openttd.org
(svn r26251) -Codechange: prepare Draw code for code deduplication (MJP)
4 files changed with 11 insertions and 11 deletions:
0 comments (0 inline, 0 general)
src/blitter/32bpp_anim_sse4.cpp
Show inline comments
 
@@ -131,13 +131,13 @@ bmno_full_transparency:
 
							src_mv += 2;
 
							src += 2;
 
							anim += 2;
 
							dst += 2;
 
						}
 

	
 
						if (bt_last == BT_ODD) {
 
						if ((bt_last == BT_NONE && effective_width & 1) || bt_last == BT_ODD) {
 
							if (src->a == 0) {
 
							} else if (src->a == 255) {
 
								*anim = *(const uint16*) src_mv;
 
								*dst = (src_mv->m >= PALETTE_ANIM_START) ? AdjustBrightness(LookupColourInPalette(src_mv->m), src_mv->v) : *src;
 
							} else {
 
								*anim = 0;
 
@@ -246,13 +246,13 @@ bmcr_full_transparency:
 
							src_mv += 2;
 
							dst += 2;
 
							src += 2;
 
							anim += 2;
 
						}
 

	
 
						if (effective_width & 1) {
 
						if ((bt_last == BT_NONE && effective_width & 1) || bt_last == BT_ODD) {
 
							/* In case the m-channel is zero, do not remap this pixel in any way. */
 
							__m128i srcABCD;
 
							if (src->a == 0) break;
 
							if (src_mv->m) {
 
								const uint r = remap[src_mv->m];
 
								*anim = (src->a == 255) ? r | ((uint16) src_mv->v << 8 ) : 0;
 
@@ -295,13 +295,13 @@ bmcr_alpha_blend_single:
 
					src += 2;
 
					dst += 2;
 
					anim += 2;
 
					if (src[-2].a) anim[-2] = 0;
 
					if (src[-1].a) anim[-1] = 0;
 
				}
 
				if (bp->width & 1) {
 
				if ((bt_last == BT_NONE && bp->width & 1) || bt_last == BT_ODD) {
 
					__m128i srcABCD = _mm_cvtsi32_si128(src->data);
 
					__m128i dstABCD = _mm_cvtsi32_si128(dst->data);
 
					DARKEN_2();
 
					dst->data = _mm_cvtsi128_si32(dstAB);
 
					if (src[0].a) anim[0] = 0;
 
				}
src/blitter/32bpp_sse2.cpp
Show inline comments
 
@@ -74,13 +74,13 @@ inline void Blitter_32bppSSE2::Draw(cons
 
							__m128i dstABCD = _mm_loadl_epi64((__m128i*) dst);
 
							ALPHA_BLEND_2();
 
							_mm_storel_epi64((__m128i*) dst, srcABCD);
 
							src += 2;
 
							dst += 2;
 
						}
 
						if (bt_last == BT_ODD) {
 
						if ((bt_last == BT_NONE && effective_width & 1) || bt_last == BT_ODD) {
 
							__m128i srcABCD = _mm_cvtsi32_si128(src->data);
 
							__m128i dstABCD = _mm_cvtsi32_si128(dst->data);
 
							ALPHA_BLEND_2();
 
							dst->data = _mm_cvtsi128_si32(srcABCD);
 
						}
 
						break;
 
@@ -150,13 +150,13 @@ bmcr_alpha_blend_single:
 
					__m128i dstABCD = _mm_loadl_epi64((__m128i*) dst);
 
					DARKEN_2();
 
					_mm_storel_epi64((__m128i *) dst, dstAB);
 
					src += 2;
 
					dst += 2;
 
				}
 
				if (bp->width & 1) {
 
				if ((bt_last == BT_NONE && bp->width & 1) || bt_last == BT_ODD) {
 
					__m128i srcABCD = _mm_cvtsi32_si128(src->data);
 
					__m128i dstABCD = _mm_cvtsi32_si128(dst->data);
 
					DARKEN_2();
 
					dst->data = _mm_cvtsi128_si32(dstAB);
 
				}
 
				break;
src/blitter/32bpp_sse4.cpp
Show inline comments
 
@@ -81,13 +81,13 @@ inline void Blitter_32bppSSE4::Draw(cons
 
							__m128i dstABCD = _mm_loadl_epi64((__m128i*) dst);
 
							ALPHA_BLEND_2();
 
							_mm_storel_epi64((__m128i*) dst, srcABCD);
 
							src += 2;
 
							dst += 2;
 
						}
 
						if (bt_last == BT_ODD) {
 
						if ((bt_last == BT_NONE && effective_width & 1) || bt_last == BT_ODD) {
 
							__m128i srcABCD = _mm_cvtsi32_si128(src->data);
 
							__m128i dstABCD = _mm_cvtsi32_si128(dst->data);
 
							ALPHA_BLEND_2();
 
							dst->data = _mm_cvtsi128_si32(srcABCD);
 
						}
 
						break;
 
@@ -150,13 +150,13 @@ inline void Blitter_32bppSSE4::Draw(cons
 
							_mm_storel_epi64((__m128i *) dst, srcABCD);
 
							dst += 2;
 
							src += 2;
 
							src_mv += 2;
 
						}
 

	
 
						if (effective_width & 1) {
 
						if ((bt_last == BT_NONE && effective_width & 1) || bt_last == BT_ODD) {
 
							/* In case the m-channel is zero, do not remap this pixel in any way. */
 
							__m128i srcABCD;
 
							if (src_mv->m) {
 
								const uint r = remap[src_mv->m];
 
								if (r != 0) {
 
									Colour remapped_colour = AdjustBrightness(this->LookupColourInPalette(r), src_mv->v);
 
@@ -194,13 +194,13 @@ bmcr_alpha_blend_single:
 
					__m128i dstABCD = _mm_loadl_epi64((__m128i*) dst);
 
					DARKEN_2();
 
					_mm_storel_epi64((__m128i *) dst, dstAB);
 
					src += 2;
 
					dst += 2;
 
				}
 
				if (bp->width & 1) {
 
				if ((bt_last == BT_NONE && bp->width & 1) || bt_last == BT_ODD) {
 
					__m128i srcABCD = _mm_cvtsi32_si128(src->data);
 
					__m128i dstABCD = _mm_cvtsi32_si128(dst->data);
 
					DARKEN_2();
 
					dst->data = _mm_cvtsi128_si32(dstAB);
 
				}
 

	
src/blitter/32bpp_ssse3.cpp
Show inline comments
 
@@ -81,13 +81,13 @@ inline void Blitter_32bppSSSE3::Draw(con
 
							__m128i dstABCD = _mm_loadl_epi64((__m128i*) dst);
 
							ALPHA_BLEND_2();
 
							_mm_storel_epi64((__m128i*) dst, srcABCD);
 
							src += 2;
 
							dst += 2;
 
						}
 
						if (bt_last == BT_ODD) {
 
						if ((bt_last == BT_NONE && effective_width & 1) || bt_last == BT_ODD) {
 
							__m128i srcABCD = _mm_cvtsi32_si128(src->data);
 
							__m128i dstABCD = _mm_cvtsi32_si128(dst->data);
 
							ALPHA_BLEND_2();
 
							dst->data = _mm_cvtsi128_si32(srcABCD);
 
						}
 
						break;
 
@@ -150,13 +150,13 @@ inline void Blitter_32bppSSSE3::Draw(con
 
							_mm_storel_epi64((__m128i *) dst, srcABCD);
 
							dst += 2;
 
							src += 2;
 
							src_mv += 2;
 
						}
 

	
 
						if (effective_width & 1) {
 
						if ((bt_last == BT_NONE && effective_width & 1) || bt_last == BT_ODD) {
 
							/* In case the m-channel is zero, do not remap this pixel in any way. */
 
							__m128i srcABCD;
 
							if (src_mv->m) {
 
								const uint r = remap[src_mv->m];
 
								if (r != 0) {
 
									Colour remapped_colour = AdjustBrightness(this->LookupColourInPalette(r), src_mv->v);
 
@@ -194,13 +194,13 @@ bmcr_alpha_blend_single:
 
					__m128i dstABCD = _mm_loadl_epi64((__m128i*) dst);
 
					DARKEN_2();
 
					_mm_storel_epi64((__m128i *) dst, dstAB);
 
					src += 2;
 
					dst += 2;
 
				}
 
				if (bp->width & 1) {
 
				if ((bt_last == BT_NONE && bp->width & 1) || bt_last == BT_ODD) {
 
					__m128i srcABCD = _mm_cvtsi32_si128(src->data);
 
					__m128i dstABCD = _mm_cvtsi32_si128(dst->data);
 
					DARKEN_2();
 
					dst->data = _mm_cvtsi128_si32(dstAB);
 
				}
 
				break;
0 comments (0 inline, 0 general)