diff options
| author | Alex Sakhartchouk <alexst@google.com> | 2010-11-10 12:16:50 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-10 12:16:50 -0800 |
| commit | 95ab69f4f4c9c097d328a4bc2448e1aa8f0f2617 (patch) | |
| tree | 079d2e8fdc2a294d7096db39634689f27272fdb8 /libs/rs/rsScriptC_LibCL.cpp | |
| parent | cf7ae94bce227e86aa5534ec36691a2611572ef9 (diff) | |
| parent | ed9f210568082dd6d1d8a0c92c693d574d87d545 (diff) | |
| download | frameworks_base-95ab69f4f4c9c097d328a4bc2448e1aa8f0f2617.zip frameworks_base-95ab69f4f4c9c097d328a4bc2448e1aa8f0f2617.tar.gz frameworks_base-95ab69f4f4c9c097d328a4bc2448e1aa8f0f2617.tar.bz2 | |
Merge "Code cleanup to make formatting consistent across all the renderscript files."
Diffstat (limited to 'libs/rs/rsScriptC_LibCL.cpp')
| -rw-r--r-- | libs/rs/rsScriptC_LibCL.cpp | 32 |
1 files changed, 9 insertions, 23 deletions
diff --git a/libs/rs/rsScriptC_LibCL.cpp b/libs/rs/rsScriptC_LibCL.cpp index 7031f84..6c0e164 100644 --- a/libs/rs/rsScriptC_LibCL.cpp +++ b/libs/rs/rsScriptC_LibCL.cpp @@ -46,7 +46,6 @@ static float SC_cospi(float v) { static float SC_exp10(float v) { return pow(10.f, v); - } static float SC_fract(float v, int *iptr) { @@ -122,54 +121,42 @@ static int8_t SC_min_i8(int8_t v, int8_t v2) {return rsMin(v, v2);} // Float util ////////////////////////////////////////////////////////////////////////////// -static float SC_clamp_f32(float amount, float low, float high) -{ +static float SC_clamp_f32(float amount, float low, float high) { return amount < low ? low : (amount > high ? high : amount); } -static float SC_degrees(float radians) -{ +static float SC_degrees(float radians) { return radians * (180.f / M_PI); } -static float SC_max_f32(float v, float v2) -{ +static float SC_max_f32(float v, float v2) { return rsMax(v, v2); } -static float SC_min_f32(float v, float v2) -{ +static float SC_min_f32(float v, float v2) { return rsMin(v, v2); } -static float SC_mix_f32(float start, float stop, float amount) -{ +static float SC_mix_f32(float start, float stop, float amount) { //LOGE("lerpf %f %f %f", start, stop, amount); return start + (stop - start) * amount; } -static float SC_radians(float degrees) -{ +static float SC_radians(float degrees) { return degrees * (M_PI / 180.f); } -static float SC_step_f32(float edge, float v) -{ +static float SC_step_f32(float edge, float v) { if (v < edge) return 0.f; return 1.f; } -static float SC_sign_f32(float value) -{ +static float SC_sign_f32(float value) { if (value > 0) return 1.f; if (value < 0) return -1.f; return value; } - - - - ////////////////////////////////////////////////////////////////////////////// // Class implementation ////////////////////////////////////////////////////////////////////////////// @@ -294,8 +281,7 @@ static ScriptCState::SymbolTable_t gSyms[] = { { NULL, NULL, false } }; -const ScriptCState::SymbolTable_t * ScriptCState::lookupSymbolCL(const char *sym) -{ +const ScriptCState::SymbolTable_t * ScriptCState::lookupSymbolCL(const char *sym) { ScriptCState::SymbolTable_t *syms = gSyms; while (syms->mPtr) { |
