callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app: implement the different composite modes for normal mode

Browse Source
This commit is contained in:
Ell
2017-02-17 11:58:18 -05:00
parent 7402127505
commit d1a0c253c2
3 changed files with 510 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

224
app/operations/layer-modes/gimpoperationnormal-sse2.c
View File

@ -51,67 +51,209 @@ gimp_operation_normal_process_sse2 (GeglOperation *operation,
} }
else else
{ {
gfloat opacity = ((GimpOperationLayerMode *)(operation))->opacity; GimpOperationLayerMode *layer_mode = (GimpOperationLayerMode *) operation;
gfloat *mask = mask_p; gfloat opacity = layer_mode->opacity;
const __v4sf *v_in = (const __v4sf*) in; gfloat *mask = mask_p;
const __v4sf *v_aux = (const __v4sf*) aux; const __v4sf *v_in = (const __v4sf*) in;
__v4sf *v_out = ( __v4sf*) out; const __v4sf *v_aux = (const __v4sf*) aux;
__v4sf *v_out = ( __v4sf*) out;
const __v4sf one = _mm_set1_ps (1.0f); const __v4sf one = _mm_set1_ps (1.0f);
const __v4sf v_opacity = _mm_set1_ps (opacity); const __v4sf v_opacity = _mm_set1_ps (opacity);
while (samples--) switch (layer_mode->composite_mode)
{ {
__v4sf rgba_in, rgba_aux, alpha; case GIMP_LAYER_COMPOSITE_SRC_OVER:
case GIMP_LAYER_COMPOSITE_AUTO:
rgba_in = *v_in++; while (samples--)
rgba_aux = *v_aux++;
/* expand alpha */
alpha = (__v4sf)_mm_shuffle_epi32 ((__m128i)rgba_aux,
_MM_SHUFFLE (3, 3, 3, 3));
if (mask)
{ {
__v4sf mask_alpha; __v4sf rgba_in, rgba_aux, alpha;
/* multiply aux's alpha by the mask */ rgba_in = *v_in++;
mask_alpha = _mm_set1_ps (*mask++); rgba_aux = *v_aux++;
alpha = alpha * mask_alpha;
}
alpha = alpha * v_opacity;
if (_mm_ucomigt_ss (alpha, _mm_setzero_ps ()))
{
__v4sf dst_alpha, a_term, out_pixel, out_alpha, out_pixel_rbaa;
/* expand alpha */ /* expand alpha */
dst_alpha = (__v4sf)_mm_shuffle_epi32 ((__m128i)rgba_in, alpha = (__v4sf)_mm_shuffle_epi32 ((__m128i)rgba_aux,
_MM_SHUFFLE (3, 3, 3, 3)); _MM_SHUFFLE (3, 3, 3, 3));
/* a_term = dst_a * (1.0 - src_a) */ if (mask)
a_term = dst_alpha * (one - alpha); {
__v4sf mask_alpha;
/* out(color) = src * src_a + dst * a_term */ /* multiply aux's alpha by the mask */
out_pixel = rgba_aux * alpha + rgba_in * a_term; mask_alpha = _mm_set1_ps (*mask++);
alpha = alpha * mask_alpha;
}
/* out(alpha) = 1.0 * src_a + 1.0 * a_term */ alpha = alpha * v_opacity;
out_alpha = alpha + a_term;
/* un-premultiply */ if (_mm_ucomigt_ss (alpha, _mm_setzero_ps ()))
out_pixel = out_pixel / out_alpha; {
__v4sf dst_alpha, a_term, out_pixel, out_alpha, out_pixel_rbaa;
/* expand alpha */
dst_alpha = (__v4sf)_mm_shuffle_epi32 ((__m128i)rgba_in,
_MM_SHUFFLE (3, 3, 3, 3));
/* a_term = dst_a * (1.0 - src_a) */
a_term = dst_alpha * (one - alpha);
/* out(color) = src * src_a + dst * a_term */
out_pixel = rgba_aux * alpha + rgba_in * a_term;
/* out(alpha) = 1.0 * src_a + 1.0 * a_term */
out_alpha = alpha + a_term;
/* un-premultiply */
out_pixel = out_pixel / out_alpha;
/* swap in the real alpha */
out_pixel_rbaa = _mm_shuffle_ps (out_pixel, out_alpha, _MM_SHUFFLE (3, 3, 2, 0));
out_pixel = _mm_shuffle_ps (out_pixel, out_pixel_rbaa, _MM_SHUFFLE (2, 1, 1, 0));
*v_out++ = out_pixel;
}
else
{
*v_out++ = rgba_in;
}
}
break;
case GIMP_LAYER_COMPOSITE_SRC_ATOP:
while (samples--)
{
__v4sf rgba_in, rgba_aux, alpha;
rgba_in = *v_in++;
rgba_aux = *v_aux++;
/* expand alpha */
alpha = (__v4sf)_mm_shuffle_epi32 ((__m128i)rgba_aux,
_MM_SHUFFLE (3, 3, 3, 3));
if (mask)
{
__v4sf mask_alpha;
/* multiply aux's alpha by the mask */
mask_alpha = _mm_set1_ps (*mask++);
alpha = alpha * mask_alpha;
}
alpha = alpha * v_opacity;
if (_mm_ucomigt_ss (alpha, _mm_setzero_ps ()))
{
__v4sf dst_alpha, out_pixel, out_pixel_rbaa;
/* expand alpha */
dst_alpha = (__v4sf)_mm_shuffle_epi32 ((__m128i)rgba_in,
_MM_SHUFFLE (3, 3, 3, 3));
/* out(color) = dst * (1 - src_a) + src * src_a */
out_pixel = rgba_in + (rgba_aux - rgba_in) * alpha;
/* swap in the real alpha */
out_pixel_rbaa = _mm_shuffle_ps (out_pixel, dst_alpha, _MM_SHUFFLE (3, 3, 2, 0));
out_pixel = _mm_shuffle_ps (out_pixel, out_pixel_rbaa, _MM_SHUFFLE (2, 1, 1, 0));
*v_out++ = out_pixel;
}
else
{
*v_out++ = rgba_in;
}
}
break;
case GIMP_LAYER_COMPOSITE_DST_ATOP:
while (samples--)
{
__v4sf rgba_in, rgba_aux, alpha;
__v4sf out_pixel, out_pixel_rbaa;
rgba_in = *v_in++;
rgba_aux = *v_aux++;
/* expand alpha */
alpha = (__v4sf)_mm_shuffle_epi32 ((__m128i)rgba_aux,
_MM_SHUFFLE (3, 3, 3, 3));
if (mask)
{
__v4sf mask_alpha;
/* multiply aux's alpha by the mask */
mask_alpha = _mm_set1_ps (*mask++);
alpha = alpha * mask_alpha;
}
alpha = alpha * v_opacity;
if (_mm_ucomigt_ss (alpha, _mm_setzero_ps ()))
{
/* out(color) = src */
out_pixel = rgba_aux;
}
else
{
out_pixel = rgba_in;
}
/* swap in the real alpha */ /* swap in the real alpha */
out_pixel_rbaa = _mm_shuffle_ps (out_pixel, out_alpha, _MM_SHUFFLE (3, 3, 2, 0)); out_pixel_rbaa = _mm_shuffle_ps (out_pixel, alpha, _MM_SHUFFLE (3, 3, 2, 0));
out_pixel = _mm_shuffle_ps (out_pixel, out_pixel_rbaa, _MM_SHUFFLE (2, 1, 1, 0)); out_pixel = _mm_shuffle_ps (out_pixel, out_pixel_rbaa, _MM_SHUFFLE (2, 1, 1, 0));
*v_out++ = out_pixel; *v_out++ = out_pixel;
} }
else break;
case GIMP_LAYER_COMPOSITE_SRC_IN:
while (samples--)
{ {
*v_out++ = rgba_in; __v4sf rgba_in, rgba_aux, alpha;
__v4sf out_pixel, out_pixel_rbaa;
rgba_in = *v_in++;
rgba_aux = *v_aux++;
/* expand alpha */
alpha = (__v4sf)_mm_shuffle_epi32 ((__m128i)rgba_aux,
_MM_SHUFFLE (3, 3, 3, 3));
if (mask)
{
__v4sf mask_alpha;
/* multiply aux's alpha by the mask */
mask_alpha = _mm_set1_ps (*mask++);
alpha = alpha * mask_alpha;
}
alpha = alpha * v_opacity;
/* multiply the alpha by in's alpha */
alpha *= (__v4sf)_mm_shuffle_epi32 ((__m128i)rgba_in,
_MM_SHUFFLE (3, 3, 3, 3));
if (_mm_ucomigt_ss (alpha, _mm_setzero_ps ()))
{
/* out(color) = src */
out_pixel = rgba_aux;
}
else
{
out_pixel = rgba_in;
}
/* swap in the real alpha */
out_pixel_rbaa = _mm_shuffle_ps (out_pixel, alpha, _MM_SHUFFLE (3, 3, 2, 0));
out_pixel = _mm_shuffle_ps (out_pixel, out_pixel_rbaa, _MM_SHUFFLE (2, 1, 1, 0));
*v_out++ = out_pixel;
} }
break;
} }
} }

221
app/operations/layer-modes/gimpoperationnormal-sse4.c
View File

@ -52,66 +52,205 @@ gimp_operation_normal_process_sse4 (GeglOperation *operation,
} }
else else
{ {
gfloat opacity = ((GimpOperationLayerMode *)(operation))->opacity; GimpOperationLayerMode *layer_mode = (GimpOperationLayerMode *) operation;
gfloat *mask = mask_p; gfloat opacity = layer_mode->opacity;
const __v4sf *v_in = (const __v4sf*) in; gfloat *mask = mask_p;
const __v4sf *v_aux = (const __v4sf*) aux; const __v4sf *v_in = (const __v4sf*) in;
__v4sf *v_out = ( __v4sf*) out; const __v4sf *v_aux = (const __v4sf*) aux;
__v4sf *v_out = ( __v4sf*) out;
const __v4sf one = _mm_set1_ps (1.0f); const __v4sf one = _mm_set1_ps (1.0f);
const __v4sf v_opacity = _mm_set1_ps (opacity); const __v4sf v_opacity = _mm_set1_ps (opacity);
while (samples--) switch (layer_mode->composite_mode)
{ {
__v4sf rgba_in, rgba_aux, alpha; case GIMP_LAYER_COMPOSITE_SRC_OVER:
case GIMP_LAYER_COMPOSITE_AUTO:
rgba_in = *v_in++; while (samples--)
rgba_aux = *v_aux++;
/* expand alpha */
alpha = (__v4sf)_mm_shuffle_epi32 ((__m128i)rgba_aux,
_MM_SHUFFLE (3, 3, 3, 3));
if (mask)
{ {
__v4sf mask_alpha; __v4sf rgba_in, rgba_aux, alpha;
/* multiply aux's alpha by the mask */ rgba_in = *v_in++;
mask_alpha = _mm_set1_ps (*mask++); rgba_aux = *v_aux++;
alpha = alpha * mask_alpha;
}
alpha = alpha * v_opacity;
if (_mm_ucomigt_ss (alpha, _mm_setzero_ps ()))
{
__v4sf dst_alpha, a_term, out_pixel, out_alpha;
/* expand alpha */ /* expand alpha */
dst_alpha = (__v4sf)_mm_shuffle_epi32 ((__m128i)rgba_in, alpha = (__v4sf)_mm_shuffle_epi32 ((__m128i)rgba_aux,
_MM_SHUFFLE (3, 3, 3, 3)); _MM_SHUFFLE (3, 3, 3, 3));
/* a_term = dst_a * (1.0 - src_a) */ if (mask)
a_term = dst_alpha * (one - alpha); {
__v4sf mask_alpha;
/* out(color) = src * src_a + dst * a_term */ /* multiply aux's alpha by the mask */
out_pixel = rgba_aux * alpha + rgba_in * a_term; mask_alpha = _mm_set1_ps (*mask++);
alpha = alpha * mask_alpha;
}
/* out(alpha) = 1.0 * src_a + 1.0 * a_term */ alpha = alpha * v_opacity;
out_alpha = alpha + a_term;
/* un-premultiply */ if (_mm_ucomigt_ss (alpha, _mm_setzero_ps ()))
out_pixel = out_pixel / out_alpha; {
__v4sf dst_alpha, a_term, out_pixel, out_alpha;
/* expand alpha */
dst_alpha = (__v4sf)_mm_shuffle_epi32 ((__m128i)rgba_in,
_MM_SHUFFLE (3, 3, 3, 3));
/* a_term = dst_a * (1.0 - src_a) */
a_term = dst_alpha * (one - alpha);
/* out(color) = src * src_a + dst * a_term */
out_pixel = rgba_aux * alpha + rgba_in * a_term;
/* out(alpha) = 1.0 * src_a + 1.0 * a_term */
out_alpha = alpha + a_term;
/* un-premultiply */
out_pixel = out_pixel / out_alpha;
/* swap in the real alpha */
out_pixel = _mm_blend_ps (out_pixel, out_alpha, 0x08);
*v_out++ = out_pixel;
}
else
{
*v_out++ = rgba_in;
}
}
break;
case GIMP_LAYER_COMPOSITE_SRC_ATOP:
while (samples--)
{
__v4sf rgba_in, rgba_aux, alpha;
rgba_in = *v_in++;
rgba_aux = *v_aux++;
/* expand alpha */
alpha = (__v4sf)_mm_shuffle_epi32 ((__m128i)rgba_aux,
_MM_SHUFFLE (3, 3, 3, 3));
if (mask)
{
__v4sf mask_alpha;
/* multiply aux's alpha by the mask */
mask_alpha = _mm_set1_ps (*mask++);
alpha = alpha * mask_alpha;
}
alpha = alpha * v_opacity;
if (_mm_ucomigt_ss (alpha, _mm_setzero_ps ()))
{
__v4sf dst_alpha, out_pixel;
/* expand alpha */
dst_alpha = (__v4sf)_mm_shuffle_epi32 ((__m128i)rgba_in,
_MM_SHUFFLE (3, 3, 3, 3));
/* out(color) = dst * (1 - src_a) + src * src_a */
out_pixel = rgba_in + (rgba_aux - rgba_in) * alpha;
/* swap in the real alpha */
out_pixel = _mm_blend_ps (out_pixel, dst_alpha, 0x08);
*v_out++ = out_pixel;
}
else
{
*v_out++ = rgba_in;
}
}
break;
case GIMP_LAYER_COMPOSITE_DST_ATOP:
while (samples--)
{
__v4sf rgba_in, rgba_aux, alpha;
__v4sf out_pixel;
rgba_in = *v_in++;
rgba_aux = *v_aux++;
/* expand alpha */
alpha = (__v4sf)_mm_shuffle_epi32 ((__m128i)rgba_aux,
_MM_SHUFFLE (3, 3, 3, 3));
if (mask)
{
__v4sf mask_alpha;
/* multiply aux's alpha by the mask */
mask_alpha = _mm_set1_ps (*mask++);
alpha = alpha * mask_alpha;
}
alpha = alpha * v_opacity;
if (_mm_ucomigt_ss (alpha, _mm_setzero_ps ()))
{
/* out(color) = src */
out_pixel = rgba_aux;
}
else
{
out_pixel = rgba_in;
}
/* swap in the real alpha */ /* swap in the real alpha */
out_pixel = _mm_blend_ps (out_pixel, out_alpha, 0x08); out_pixel = _mm_blend_ps (out_pixel, alpha, 0x08);
*v_out++ = out_pixel; *v_out++ = out_pixel;
} }
else break;
case GIMP_LAYER_COMPOSITE_SRC_IN:
while (samples--)
{ {
*v_out++ = rgba_in; __v4sf rgba_in, rgba_aux, alpha;
__v4sf out_pixel;
rgba_in = *v_in++;
rgba_aux = *v_aux++;
/* expand alpha */
alpha = (__v4sf)_mm_shuffle_epi32 ((__m128i)rgba_aux,
_MM_SHUFFLE (3, 3, 3, 3));
if (mask)
{
__v4sf mask_alpha;
/* multiply aux's alpha by the mask */
mask_alpha = _mm_set1_ps (*mask++);
alpha = alpha * mask_alpha;
}
alpha = alpha * v_opacity;
/* multiply the alpha by in's alpha */
alpha *= (__v4sf)_mm_shuffle_epi32 ((__m128i)rgba_in,
_MM_SHUFFLE (3, 3, 3, 3));
if (_mm_ucomigt_ss (alpha, _mm_setzero_ps ()))
{
/* out(color) = src */
out_pixel = rgba_aux;
}
else
{
out_pixel = rgba_in;
}
/* swap in the real alpha */
out_pixel = _mm_blend_ps (out_pixel, alpha, 0x08);
*v_out++ = out_pixel;
} }
break;
} }
} }

171
app/operations/layer-modes/gimpoperationnormal.c
View File

@ -123,43 +123,166 @@ gimp_operation_normal_process_core (GeglOperation *op,
gfloat opacity = layer_mode->opacity; gfloat opacity = layer_mode->opacity;
const gboolean has_mask = mask != NULL; const gboolean has_mask = mask != NULL;
while (samples--) switch (layer_mode->composite_mode)
{ {
gfloat layer_alpha; case GIMP_LAYER_COMPOSITE_SRC_OVER:
case GIMP_LAYER_COMPOSITE_AUTO:
layer_alpha = layer[ALPHA] * opacity; while (samples--)
if (has_mask)
layer_alpha *= *mask;
out[ALPHA] = layer_alpha + in[ALPHA] - layer_alpha * in[ALPHA];
if (out[ALPHA])
{ {
gfloat layer_weight = layer_alpha / out[ALPHA]; gfloat layer_alpha;
gfloat in_weight = 1.0f - layer_weight;
gint b;
for (b = RED; b < ALPHA; b++) layer_alpha = layer[ALPHA] * opacity;
if (has_mask)
layer_alpha *= *mask;
out[ALPHA] = layer_alpha + in[ALPHA] - layer_alpha * in[ALPHA];
if (out[ALPHA])
{ {
out[b] = layer[b] * layer_weight + in[b] * in_weight; gfloat layer_weight = layer_alpha / out[ALPHA];
gfloat in_weight = 1.0f - layer_weight;
gint b;
for (b = RED; b < ALPHA; b++)
{
out[b] = layer[b] * layer_weight + in[b] * in_weight;
}
} }
else
{
gint b;
for (b = RED; b < ALPHA; b++)
{
out[b] = in[b];
}
}
in += 4;
layer += 4;
out += 4;
if (has_mask)
mask++;
} }
else break;
case GIMP_LAYER_COMPOSITE_SRC_ATOP:
while (samples--)
{ {
gint b; gfloat layer_alpha;
for (b = RED; b < ALPHA; b++) layer_alpha = layer[ALPHA] * opacity;
if (has_mask)
layer_alpha *= *mask;
out[ALPHA] = in[ALPHA];
if (out[ALPHA])
{ {
out[b] = in[b]; gint b;
for (b = RED; b < ALPHA; b++)
{
out[b] = in[b] + (layer[b] - in[b]) * layer_alpha;
}
} }
else
{
gint b;
for (b = RED; b < ALPHA; b++)
{
out[b] = in[b];
}
}
in += 4;
layer += 4;
out += 4;
if (has_mask)
mask++;
} }
break;
in += 4; case GIMP_LAYER_COMPOSITE_DST_ATOP:
layer += 4; while (samples--)
out += 4; {
gfloat layer_alpha;
if (has_mask) layer_alpha = layer[ALPHA] * opacity;
mask++; if (has_mask)
layer_alpha *= *mask;
out[ALPHA] = layer_alpha;
if (out[ALPHA])
{
gint b;
for (b = RED; b < ALPHA; b++)
{
out[b] = layer[b];
}
}
else
{
gint b;
for (b = RED; b < ALPHA; b++)
{
out[b] = in[b];
}
}
in += 4;
layer += 4;
out += 4;
if (has_mask)
mask++;
}
break;
case GIMP_LAYER_COMPOSITE_SRC_IN:
while (samples--)
{
gfloat layer_alpha;
layer_alpha = layer[ALPHA] * opacity;
if (has_mask)
layer_alpha *= *mask;
out[ALPHA] = in[ALPHA] * layer_alpha;
if (out[ALPHA])
{
gint b;
for (b = RED; b < ALPHA; b++)
{
out[b] = layer[b];
}
}
else
{
gint b;
for (b = RED; b < ALPHA; b++)
{
out[b] = in[b];
}
}
in += 4;
layer += 4;
out += 4;
if (has_mask)
mask++;
}
break;
} }
return TRUE; return TRUE;