Skip to content

Commit 36fa5a4

Browse files
author
Jason Sams
committed
Fix aprox fs function names
bug b206696 Change-Id: I64c092c1f6b8d990783bf5d31db37e12a4dbdb82
1 parent d053554 commit 36fa5a4

File tree

3 files changed

+11
-12
lines changed

3 files changed

+11
-12
lines changed

tests/RenderScriptTests/ComputeBenchmark/src/com/example/android/rs/computebench/compute_benchmark.rs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -383,13 +383,12 @@ static void bench_fp_math() {
383383
}
384384

385385
static void bench_approx_math() {
386-
BENCH_FN_FUNC_FN(approx_recip);
387-
BENCH_FN_FUNC_FN(approx_sqrt);
388-
BENCH_FN_FUNC_FN(approx_rsqrt);
389-
BENCH_FN_FUNC_FN(approx_length);
390-
BENCH_FN_FUNC_FN_FN(approx_distance);
391-
BENCH_FN_FUNC_FN(approx_normalize);
392-
BENCH_FN_FUNC_FN(approx_atan);
386+
BENCH_FN_FUNC_FN(half_recip);
387+
BENCH_FN_FUNC_FN(half_sqrt);
388+
BENCH_FN_FUNC_FN(half_rsqrt);
389+
BENCH_FN_FUNC_FN(fast_length);
390+
BENCH_FN_FUNC_FN_FN(fast_distance);
391+
BENCH_FN_FUNC_FN(fast_normalize);
393392
}
394393

395394
void bench() {

tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/fisheye_approx.rsh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ void root(uchar4 *out, uint32_t x, uint32_t y) {
4848
const float2 coord = mad(inCoord, inv_dimensions, neg_center);
4949
const float2 scaledCoord = axis_scale * coord;
5050
const float dist2 = scaledCoord.x*scaledCoord.x + scaledCoord.y*scaledCoord.y;
51-
const float inv_dist = approx_rsqrt(dist2);
52-
const float radian = M_PI_2 - approx_atan((alpha * approx_sqrt(radius2 - dist2)) * inv_dist);
51+
const float inv_dist = half_rsqrt(dist2);
52+
const float radian = M_PI_2 - atan((alpha * half_sqrt(radius2 - dist2)) * inv_dist);
5353
const float scalar = radian * factor * inv_dist;
5454
const float2 new_coord = mad(coord, scalar, center);
5555
const float4 fout = rsSample(in_alloc, sampler, new_coord);

tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/vignette_approx.rsh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ void root(const uchar4 *in, uchar4 *out, uint32_t x, uint32_t y) {
4949
const float4 fin = convert_float4(*in);
5050
const float2 inCoord = {(float)x, (float)y};
5151
const float2 coord = mad(inCoord, inv_dimensions, neg_center);
52-
const float sloped_dist_ratio = approx_length(axis_scale * coord) * sloped_inv_max_dist;
53-
// TODO: add approx_exp once implemented
54-
const float lumen = opp_shade + shade * approx_recip(1.f + sloped_neg_range * exp(sloped_dist_ratio));
52+
const float sloped_dist_ratio = fast_length(axis_scale * coord) * sloped_inv_max_dist;
53+
// TODO: add half_exp once implemented
54+
const float lumen = opp_shade + shade * half_recip(1.f + sloped_neg_range * exp(sloped_dist_ratio));
5555
float4 fout;
5656
fout.rgb = fin.rgb * lumen;
5757
fout.w = fin.w;

0 commit comments

Comments
 (0)