clean up legacy flags

Never needed to use them.

Change-Id: I871e262386365c4fbb4de519277fa84d313387c9
Reviewed-on: https://skia-review.googlesource.com/152460
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
This commit is contained in:
Mike Klein 2018-09-06 15:23:29 -04:00 committed by Skia Commit-Bot
parent ec52ddf64d
commit b1c77e4753

View File

@ -1446,26 +1446,15 @@ STAGE(byte_tables, const void* ctx) { // TODO: rename Tables SkJumper_ByteTable
a = from_byte(gather(tables->a, to_unorm(a, 255)));
}
#if defined(SK_LEGACY_EXTENDED_TRANSFER_FUNCTIONS)
SI F strip_sign(F x, U32* sign) {
(void)sign;
return x;
}
SI F apply_sign(F x, U32 sign) {
(void)sign;
return x;
}
#else
SI F strip_sign(F x, U32* sign) {
U32 bits = bit_cast<U32>(x);
*sign = bits & 0x80000000;
return bit_cast<F>(bits ^ *sign);
}
SI F strip_sign(F x, U32* sign) {
U32 bits = bit_cast<U32>(x);
*sign = bits & 0x80000000;
return bit_cast<F>(bits ^ *sign);
}
SI F apply_sign(F x, U32 sign) {
return bit_cast<F>(sign | bit_cast<U32>(x));
}
#endif
SI F apply_sign(F x, U32 sign) {
return bit_cast<F>(sign | bit_cast<U32>(x));
}
STAGE(parametric, const SkJumper_ParametricTransferFunction* ctx) {
auto fn = [&](F v) {
@ -1474,12 +1463,7 @@ STAGE(parametric, const SkJumper_ParametricTransferFunction* ctx) {
F r = if_then_else(v <= ctx->D, mad(ctx->C, v, ctx->F)
, approx_powf(mad(ctx->A, v, ctx->B), ctx->G) + ctx->E);
#if defined(SK_LEGACY_PARAMETRIC_CLAMP)
// Clamp to [0,1], with argument order mattering to handle NaN.
return apply_sign(min(max(r, 0), 1.0f), sign);
#else
return apply_sign(r, sign);
#endif
};
r = fn(r);
g = fn(g);