Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "save 2ms replace div with mul." into jb-mr1-dev

Browse Source
This commit is contained in:
Jason Sams
2012-07-31 15:30:28 -07:00
committed by Android (Google) Code Review
parent 22a7b9de5e 41bd3508e7
commit a9fa7b25dd
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/vignette.rsh
View File

@@ -17,6 +17,7 @@
static float2 scale; static float2 scale;
static float2 center, dimensions; static float2 center, dimensions;
static float range, inv_max_dist, shade, slope; static float range, inv_max_dist, shade, slope;
static float2 overDimensions;
void init_vignette(uint32_t dim_x, uint32_t dim_y, float center_x, float center_y, void init_vignette(uint32_t dim_x, uint32_t dim_y, float center_x, float center_y,
float desired_scale, float desired_shade, float desired_slope) { float desired_scale, float desired_shade, float desired_slope) {
@@ -43,20 +44,21 @@ void init_vignette(uint32_t dim_x, uint32_t dim_y, float center_x, float center_
range = 1.3 - 0.7*sqrt(desired_scale); range = 1.3 - 0.7*sqrt(desired_scale);
shade = desired_shade; shade = desired_shade;
slope = desired_slope; slope = desired_slope;
overDimensions = ((float2)1.f) / dimensions;
} }
void root(const uchar4 *in, uchar4 *out, uint32_t x, uint32_t y) { void root(const uchar4 *in, uchar4 *out, uint32_t x, uint32_t y) {
// Convert x and y to floating point coordinates with center as origin // Convert x and y to floating point coordinates with center as origin
const float4 fin = rsUnpackColor8888(*in); const float4 fin = convert_float4(*in);
float2 coord; float2 coord = {(float)x, (float)y};
coord.x = (float)x / dimensions.x; coord *= overDimensions;
coord.y = (float)y / dimensions.y;
coord -= center; coord -= center;
const float dist = length(scale * coord); const float dist = length(scale * coord);
const float lumen = shade / (1.0 + exp((dist * inv_max_dist - range) * slope)) + (1.0 - shade); const float lumen = shade / (1.0 + exp((dist * inv_max_dist - range) * slope)) + (1.0 - shade);
float4 fout; float4 fout;
fout.rgb = fin.rgb * lumen; fout.rgb = fin.rgb * lumen;
fout.w = fin.w; fout.w = fin.w;
*out = rsPackColorTo8888(fout); *out = convert_uchar4(fout);
} }