[[ Bug 19926 ]] Remove unnecessary (and incorrectly scaled) alpha mask from legacy gradient shader

livecodeian · livecodeian · commit 3330320d7966 · 2017-08-08T17:34:58.000+01:00
diff --git a/libgraphics/src/graphics-internal.h b/libgraphics/src/graphics-internal.h
@@ -484,7 +484,6 @@ class MCGLegacyGradientShader : public SkShader
 
     private:
         int32_t					m_y;
-        uint8_t					*m_mask;
         MCGradientCombiner_t	*m_gradient_combiner;
 
         typedef SkShader::Context INHERITED;
diff --git a/libgraphics/src/legacygradients.cpp b/libgraphics/src/legacygradients.cpp
@@ -117,7 +117,7 @@ struct MCCombiner
 	void (*begin)(MCCombiner *self, int4 y);
 	void (*advance)(MCCombiner *self, int4 y);
 	void (*blend)(MCCombiner *self, int4 fx, int4 tx, uint1 value);
-	void (*combine)(MCCombiner *self, int4 fx, int4 tx, uint1 *mask);
+	void (*combine)(MCCombiner *self, int4 fx, int4 tx);
 	void (*end)(MCCombiner *self);
 };
 
@@ -456,7 +456,7 @@ template<MCGradientFillKind x_type> static void MCGradientFillBlend(MCCombiner *
 	}
 }
 
-template<MCGradientFillKind x_type> static void MCGradientFillCombine(MCCombiner *_self, int4 fx, int4 tx, uint1 *mask)
+template<MCGradientFillKind x_type> static void MCGradientFillCombine(MCCombiner *_self, int4 fx, int4 tx)
 {
 	MCGradientAffineCombiner *self = (MCGradientAffineCombiner*)_self;
 	uint4 *d;
@@ -487,7 +487,7 @@ template<MCGradientFillKind x_type> static void MCGradientFillCombine(MCCombiner
 			s = self->ramp[0].hw_color;
 			while (t_index <= t_min)
 			{
-				uint4 sa = packed_scale_bounded(s | 0xFF000000, ((s >> 24) * *mask++) / 255);
+				uint4 sa = packed_scale_bounded(s | 0xFF000000, (s >> 24));
 				d[fx] = packed_scale_bounded(d[fx], 255 - (sa >> 24)) + sa;
 				fx += 1;
 				if (fx == tx)
@@ -503,7 +503,7 @@ template<MCGradientFillKind x_type> static void MCGradientFillCombine(MCCombiner
 			s = self->ramp[self->ramp_length - 1].hw_color;
 			while (t_index >= t_max)
 			{
-				uint4 sa = packed_scale_bounded(s | 0xFF000000, ((s >> 24) * *mask++) / 255);
+				uint4 sa = packed_scale_bounded(s | 0xFF000000, (s >> 24));
 				d[fx] = packed_scale_bounded(d[fx], 255 - (sa >> 24)) + sa;
 				fx += 1;
 				if (fx == tx)
@@ -530,7 +530,7 @@ template<MCGradientFillKind x_type> static void MCGradientFillCombine(MCCombiner
 				uint1 a = 255 - b;
 				
 				s = packed_bilinear_bounded(t_current_color, a, t_next_color, b);
-				uint4 sa = packed_scale_bounded(s | 0xFF000000, ((s >> 24) * *mask++) / 255);
+				uint4 sa = packed_scale_bounded(s | 0xFF000000, (s >> 24));
 				d[fx] = packed_scale_bounded(d[fx], 255 - (sa >> 24)) + sa;
 				fx += 1;
 				if (fx == tx)
@@ -697,7 +697,7 @@ template<MCGradientFillKind x_type> static void MCGradientFillBilinearBlend(MCCo
 	}
 }
 
-template<MCGradientFillKind x_type> static void MCGradientFillBilinearCombine(MCCombiner *_self, int4 fx, int4 tx, uint1* mask)
+template<MCGradientFillKind x_type> static void MCGradientFillBilinearCombine(MCCombiner *_self, int4 fx, int4 tx)
 {
 	MCGradientAffineCombiner *self = (MCGradientAffineCombiner*)_self;
 	uint4 *d;
@@ -743,7 +743,7 @@ template<MCGradientFillKind x_type> static void MCGradientFillBilinearCombine(MC
 		i++;
 		
 		s = u | v;
-		uint1 alpha = (s >> 24) * (*mask++) / 255;
+		uint1 alpha = (s >> 24);
 		d[fx] = packed_bilinear_bounded(d[fx], 255 - alpha, s | 0xFF000000, alpha);
 	}
 }
@@ -971,7 +971,7 @@ sk_sp<SkFlattenable> MCGLegacyGradientShader::CreateProc(SkReadBuffer& buffer)
 }
 
 MCGLegacyGradientShader::MCGLegacyGradientShaderContext::MCGLegacyGradientShaderContext(const MCGLegacyGradientShader& p_shader, const ContextRec& p_rec, MCGGradientRef p_gradient_ref, MCGRectangle p_clip)
-: INHERITED(p_shader, p_rec), m_y(0), m_mask(NULL), m_gradient_combiner(NULL)
+: INHERITED(p_shader, p_rec), m_y(0), m_gradient_combiner(NULL)
 {
     MCGRectangle t_clip;
     
@@ -985,12 +985,8 @@ MCGLegacyGradientShader::MCGLegacyGradientShaderContext::MCGLegacyGradientShader
 	bool t_success;
 	t_success = true;
 	
-	if (t_success)
-		t_success = MCMemoryAllocate(t_width, m_mask);
-	
 	if (t_success)
 	{	
-		memset(m_mask, 0xFF, t_width);
 		m_gradient_combiner = MCGradientFillCreateCombiner(p_gradient_ref, t_clip, t_matrix);
 		t_success = m_gradient_combiner != NULL;		
 	}
@@ -1006,7 +1002,6 @@ MCGLegacyGradientShader::MCGLegacyGradientShaderContext::MCGLegacyGradientShader
 
 MCGLegacyGradientShader::MCGLegacyGradientShaderContext::~MCGLegacyGradientShaderContext()
 {
-    MCMemoryDeallocate(m_mask);
     MCGradientFillDeleteCombiner(m_gradient_combiner);
 }
 
@@ -1020,7 +1015,7 @@ void MCGLegacyGradientShader::MCGLegacyGradientShaderContext::shadeSpan(int x, i
 		m_y = y;
 		memset(dstC, 0x00, count * sizeof(SkPMColor));
 		m_gradient_combiner -> bits = dstC - x;
-		m_gradient_combiner -> combine(m_gradient_combiner, x, x + count, m_mask);
+		m_gradient_combiner -> combine(m_gradient_combiner, x, x + count);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ struct MCCombiner`
`117`	`117`	`void (begin)(MCCombiner self, int4 y);`
`118`	`118`	`void (advance)(MCCombiner self, int4 y);`
`119`	`119`	`void (blend)(MCCombiner self, int4 fx, int4 tx, uint1 value);`
`120`		`- void (combine)(MCCombiner self, int4 fx, int4 tx, uint1 *mask);`
	`120`	`+ void (combine)(MCCombiner self, int4 fx, int4 tx);`
`121`	`121`	`void (end)(MCCombiner self);`
`122`	`122`	`};`
`123`	`123`
`@@ -456,7 +456,7 @@ template<MCGradientFillKind x_type> static void MCGradientFillBlend(MCCombiner *`
`456`	`456`	`}`
`457`	`457`	`}`
`458`	`458`
`459`		`-template<MCGradientFillKind x_type> static void MCGradientFillCombine(MCCombiner _self, int4 fx, int4 tx, uint1 mask)`
	`459`	`+template<MCGradientFillKind x_type> static void MCGradientFillCombine(MCCombiner *_self, int4 fx, int4 tx)`
`460`	`460`	`{`
`461`	`461`	`MCGradientAffineCombiner self = (MCGradientAffineCombiner)_self;`
`462`	`462`	`uint4 *d;`
`@@ -487,7 +487,7 @@ template<MCGradientFillKind x_type> static void MCGradientFillCombine(MCCombiner`
`487`	`487`	`s = self->ramp[0].hw_color;`
`488`	`488`	`while (t_index <= t_min)`
`489`	`489`	`{`
`490`		`- uint4 sa = packed_scale_bounded(s \| 0xFF000000, ((s >> 24) * *mask++) / 255);`
	`490`	`+ uint4 sa = packed_scale_bounded(s \| 0xFF000000, (s >> 24));`
`491`	`491`	`d[fx] = packed_scale_bounded(d[fx], 255 - (sa >> 24)) + sa;`
`492`	`492`	`fx += 1;`
`493`	`493`	`if (fx == tx)`
`@@ -503,7 +503,7 @@ template<MCGradientFillKind x_type> static void MCGradientFillCombine(MCCombiner`
`503`	`503`	`s = self->ramp[self->ramp_length - 1].hw_color;`
`504`	`504`	`while (t_index >= t_max)`
`505`	`505`	`{`
`506`		`- uint4 sa = packed_scale_bounded(s \| 0xFF000000, ((s >> 24) * *mask++) / 255);`
	`506`	`+ uint4 sa = packed_scale_bounded(s \| 0xFF000000, (s >> 24));`
`507`	`507`	`d[fx] = packed_scale_bounded(d[fx], 255 - (sa >> 24)) + sa;`
`508`	`508`	`fx += 1;`
`509`	`509`	`if (fx == tx)`
`@@ -530,7 +530,7 @@ template<MCGradientFillKind x_type> static void MCGradientFillCombine(MCCombiner`
`530`	`530`	`uint1 a = 255 - b;`
`531`	`531`
`532`	`532`	`s = packed_bilinear_bounded(t_current_color, a, t_next_color, b);`
`533`		`- uint4 sa = packed_scale_bounded(s \| 0xFF000000, ((s >> 24) * *mask++) / 255);`
	`533`	`+ uint4 sa = packed_scale_bounded(s \| 0xFF000000, (s >> 24));`
`534`	`534`	`d[fx] = packed_scale_bounded(d[fx], 255 - (sa >> 24)) + sa;`
`535`	`535`	`fx += 1;`
`536`	`536`	`if (fx == tx)`
`@@ -697,7 +697,7 @@ template<MCGradientFillKind x_type> static void MCGradientFillBilinearBlend(MCCo`
`697`	`697`	`}`
`698`	`698`	`}`
`699`	`699`
`700`		`-template<MCGradientFillKind x_type> static void MCGradientFillBilinearCombine(MCCombiner _self, int4 fx, int4 tx, uint1 mask)`
	`700`	`+template<MCGradientFillKind x_type> static void MCGradientFillBilinearCombine(MCCombiner *_self, int4 fx, int4 tx)`
`701`	`701`	`{`
`702`	`702`	`MCGradientAffineCombiner self = (MCGradientAffineCombiner)_self;`
`703`	`703`	`uint4 *d;`
`@@ -743,7 +743,7 @@ template<MCGradientFillKind x_type> static void MCGradientFillBilinearCombine(MC`
`743`	`743`	`i++;`
`744`	`744`
`745`	`745`	`s = u \| v;`
`746`		`- uint1 alpha = (s >> 24) * (*mask++) / 255;`
	`746`	`+ uint1 alpha = (s >> 24);`
`747`	`747`	`d[fx] = packed_bilinear_bounded(d[fx], 255 - alpha, s \| 0xFF000000, alpha);`
`748`	`748`	`}`
`749`	`749`	`}`
`@@ -971,7 +971,7 @@ sk_sp<SkFlattenable> MCGLegacyGradientShader::CreateProc(SkReadBuffer& buffer)`
`971`	`971`	`}`
`972`	`972`
`973`	`973`	`MCGLegacyGradientShader::MCGLegacyGradientShaderContext::MCGLegacyGradientShaderContext(const MCGLegacyGradientShader& p_shader, const ContextRec& p_rec, MCGGradientRef p_gradient_ref, MCGRectangle p_clip)`
`974`		`-: INHERITED(p_shader, p_rec), m_y(0), m_mask(NULL), m_gradient_combiner(NULL)`
	`974`	`+: INHERITED(p_shader, p_rec), m_y(0), m_gradient_combiner(NULL)`
`975`	`975`	`{`
`976`	`976`	`MCGRectangle t_clip;`
`977`	`977`
`@@ -985,12 +985,8 @@ MCGLegacyGradientShader::MCGLegacyGradientShaderContext::MCGLegacyGradientShader`
`985`	`985`	`bool t_success;`
`986`	`986`	`t_success = true;`
`987`	`987`
`988`		`- if (t_success)`
`989`		`- t_success = MCMemoryAllocate(t_width, m_mask);`
`990`		`-`
`991`	`988`	`if (t_success)`
`992`	`989`	`{`
`993`		`- memset(m_mask, 0xFF, t_width);`
`994`	`990`	`m_gradient_combiner = MCGradientFillCreateCombiner(p_gradient_ref, t_clip, t_matrix);`
`995`	`991`	`t_success = m_gradient_combiner != NULL;`
`996`	`992`	`}`
`@@ -1006,7 +1002,6 @@ MCGLegacyGradientShader::MCGLegacyGradientShaderContext::MCGLegacyGradientShader`
`1006`	`1002`
`1007`	`1003`	`MCGLegacyGradientShader::MCGLegacyGradientShaderContext::~MCGLegacyGradientShaderContext()`
`1008`	`1004`	`{`
`1009`		`- MCMemoryDeallocate(m_mask);`
`1010`	`1005`	`MCGradientFillDeleteCombiner(m_gradient_combiner);`
`1011`	`1006`	`}`
`1012`	`1007`
`@@ -1020,7 +1015,7 @@ void MCGLegacyGradientShader::MCGLegacyGradientShaderContext::shadeSpan(int x, i`
`1020`	`1015`	`m_y = y;`
`1021`	`1016`	`memset(dstC, 0x00, count * sizeof(SkPMColor));`
`1022`	`1017`	`m_gradient_combiner -> bits = dstC - x;`
`1023`		`- m_gradient_combiner -> combine(m_gradient_combiner, x, x + count, m_mask);`
	`1018`	`+ m_gradient_combiner -> combine(m_gradient_combiner, x, x + count);`
`1024`	`1019`	`}`
`1025`	`1020`	`}`
`1026`	`1021`