diff options
author | Stephen Hines <srhines@google.com> | 2011-01-18 16:53:19 -0800 |
---|---|---|
committer | Stephen Hines <srhines@google.com> | 2011-01-18 16:53:19 -0800 |
commit | 793786c25878f1324b9cb44c47050c180ad68693 (patch) | |
tree | 596d5cbe4248d0e024a58f62a449b412488c37f2 /libs | |
parent | 0e5f4e549bec3bf998e1db3af47ccb353c31ff63 (diff) | |
download | frameworks_base-793786c25878f1324b9cb44c47050c180ad68693.zip frameworks_base-793786c25878f1324b9cb44c47050c180ad68693.tar.gz frameworks_base-793786c25878f1324b9cb44c47050c180ad68693.tar.bz2 |
Provide mechanism to switch between extern/static.
Change-Id: I59b1b45cc335278f92b68581594ca68115b9a590
Diffstat (limited to 'libs')
-rw-r--r-- | libs/rs/scriptc/rs_cl.rsh | 196 | ||||
-rw-r--r-- | libs/rs/scriptc/rs_core.rsh | 150 |
2 files changed, 179 insertions, 167 deletions
diff --git a/libs/rs/scriptc/rs_cl.rsh b/libs/rs/scriptc/rs_cl.rsh index b9bb1f7..4384ec6 100644 --- a/libs/rs/scriptc/rs_cl.rsh +++ b/libs/rs/scriptc/rs_cl.rsh @@ -1,20 +1,25 @@ #ifndef __RS_CL_RSH__ #define __RS_CL_RSH__ -#define M_PI 3.14159265358979323846264338327950288f /* pi */ +#ifdef BCC_PREPARE_BC +#define _RS_STATIC extern +#else +#define _RS_STATIC static +#endif +#define M_PI 3.14159265358979323846264338327950288f /* pi */ // Conversions #define CVT_FUNC_2(typeout, typein) \ -static typeout##2 __attribute__((overloadable)) convert_##typeout##2(typein##2 v) { \ +_RS_STATIC typeout##2 __attribute__((overloadable)) convert_##typeout##2(typein##2 v) { \ typeout##2 r = {(typeout)v.x, (typeout)v.y}; \ return r; \ } \ -static typeout##3 __attribute__((overloadable)) convert_##typeout##3(typein##3 v) { \ +_RS_STATIC typeout##3 __attribute__((overloadable)) convert_##typeout##3(typein##3 v) { \ typeout##3 r = {(typeout)v.x, (typeout)v.y, (typeout)v.z}; \ return r; \ } \ -static typeout##4 __attribute__((overloadable)) convert_##typeout##4(typein##4 v) { \ +_RS_STATIC typeout##4 __attribute__((overloadable)) convert_##typeout##4(typein##4 v) { \ typeout##4 r = {(typeout)v.x, (typeout)v.y, (typeout)v.z, (typeout)v.w}; \ return r; \ } @@ -40,20 +45,20 @@ CVT_FUNC(float) // Float ops, 6.11.2 #define DEF_FUNC_1(fnc) \ -static float2 __attribute__((overloadable)) fnc(float2 v) { \ +_RS_STATIC float2 __attribute__((overloadable)) fnc(float2 v) { \ float2 r; \ r.x = fnc(v.x); \ r.y = fnc(v.y); \ return r; \ } \ -static float3 __attribute__((overloadable)) fnc(float3 v) { \ +_RS_STATIC float3 __attribute__((overloadable)) fnc(float3 v) { \ float3 r; \ r.x = fnc(v.x); \ r.y = fnc(v.y); \ r.z = fnc(v.z); \ return r; \ } \ -static float4 __attribute__((overloadable)) fnc(float4 v) { \ +_RS_STATIC float4 __attribute__((overloadable)) fnc(float4 v) { \ float4 r; \ r.x = fnc(v.x); \ r.y = fnc(v.y); \ @@ -63,20 +68,20 @@ static float4 __attribute__((overloadable)) fnc(float4 v) { \ } #define DEF_FUNC_1_RI(fnc) \ -static int2 __attribute__((overloadable)) fnc(float2 v) { \ +_RS_STATIC int2 __attribute__((overloadable)) fnc(float2 v) { \ int2 r; \ r.x = fnc(v.x); \ r.y = fnc(v.y); \ return r; \ } \ -static int3 __attribute__((overloadable)) fnc(float3 v) { \ +_RS_STATIC int3 __attribute__((overloadable)) fnc(float3 v) { \ int3 r; \ r.x = fnc(v.x); \ r.y = fnc(v.y); \ r.z = fnc(v.z); \ return r; \ } \ -static int4 __attribute__((overloadable)) fnc(float4 v) { \ +_RS_STATIC int4 __attribute__((overloadable)) fnc(float4 v) { \ int4 r; \ r.x = fnc(v.x); \ r.y = fnc(v.y); \ @@ -86,20 +91,20 @@ static int4 __attribute__((overloadable)) fnc(float4 v) { \ } #define DEF_FUNC_2(fnc) \ -static float2 __attribute__((overloadable)) fnc(float2 v1, float2 v2) { \ +_RS_STATIC float2 __attribute__((overloadable)) fnc(float2 v1, float2 v2) { \ float2 r; \ r.x = fnc(v1.x, v2.x); \ r.y = fnc(v1.y, v2.y); \ return r; \ } \ -static float3 __attribute__((overloadable)) fnc(float3 v1, float3 v2) { \ +_RS_STATIC float3 __attribute__((overloadable)) fnc(float3 v1, float3 v2) { \ float3 r; \ r.x = fnc(v1.x, v2.x); \ r.y = fnc(v1.y, v2.y); \ r.z = fnc(v1.z, v2.z); \ return r; \ } \ -static float4 __attribute__((overloadable)) fnc(float4 v1, float4 v2) { \ +_RS_STATIC float4 __attribute__((overloadable)) fnc(float4 v1, float4 v2) { \ float4 r; \ r.x = fnc(v1.x, v2.x); \ r.y = fnc(v1.y, v2.y); \ @@ -109,20 +114,20 @@ static float4 __attribute__((overloadable)) fnc(float4 v1, float4 v2) { \ } #define DEF_FUNC_2F(fnc) \ -static float2 __attribute__((overloadable)) fnc(float2 v1, float v2) { \ +_RS_STATIC float2 __attribute__((overloadable)) fnc(float2 v1, float v2) { \ float2 r; \ r.x = fnc(v1.x, v2); \ r.y = fnc(v1.y, v2); \ return r; \ } \ -static float3 __attribute__((overloadable)) fnc(float3 v1, float v2) { \ +_RS_STATIC float3 __attribute__((overloadable)) fnc(float3 v1, float v2) { \ float3 r; \ r.x = fnc(v1.x, v2); \ r.y = fnc(v1.y, v2); \ r.z = fnc(v1.z, v2); \ return r; \ } \ -static float4 __attribute__((overloadable)) fnc(float4 v1, float v2) { \ +_RS_STATIC float4 __attribute__((overloadable)) fnc(float4 v1, float v2) { \ float4 r; \ r.x = fnc(v1.x, v2); \ r.y = fnc(v1.y, v2); \ @@ -138,7 +143,7 @@ DEF_FUNC_1(acos) extern float __attribute__((overloadable)) acosh(float); DEF_FUNC_1(acosh) -static float __attribute__((overloadable)) acospi(float v) { +_RS_STATIC float __attribute__((overloadable)) acospi(float v) { return acos(v) / M_PI; } DEF_FUNC_1(acospi) @@ -149,7 +154,7 @@ DEF_FUNC_1(asin) extern float __attribute__((overloadable)) asinh(float); DEF_FUNC_1(asinh) -static float __attribute__((overloadable)) asinpi(float v) { +_RS_STATIC float __attribute__((overloadable)) asinpi(float v) { return asin(v) / M_PI; } DEF_FUNC_1(asinpi) @@ -163,12 +168,12 @@ DEF_FUNC_2(atan2) extern float __attribute__((overloadable)) atanh(float); DEF_FUNC_1(atanh) -static float __attribute__((overloadable)) atanpi(float v) { +_RS_STATIC float __attribute__((overloadable)) atanpi(float v) { return atan(v) / M_PI; } DEF_FUNC_1(atanpi) -static float __attribute__((overloadable)) atan2pi(float y, float x) { +_RS_STATIC float __attribute__((overloadable)) atan2pi(float y, float x) { return atan2(y, x) / M_PI; } DEF_FUNC_2(atan2pi) @@ -188,7 +193,7 @@ DEF_FUNC_1(cos) extern float __attribute__((overloadable)) cosh(float); DEF_FUNC_1(cosh) -static float __attribute__((overloadable)) cospi(float v) { +_RS_STATIC float __attribute__((overloadable)) cospi(float v) { return cos(v * M_PI); } DEF_FUNC_1(cospi) @@ -206,7 +211,7 @@ extern float __attribute__((overloadable)) exp2(float); DEF_FUNC_1(exp2) extern float __attribute__((overloadable)) pow(float, float); -static float __attribute__((overloadable)) exp10(float v) { +_RS_STATIC float __attribute__((overloadable)) exp10(float v) { return pow(10.f, v); } DEF_FUNC_1(exp10) @@ -239,12 +244,12 @@ DEF_FUNC_2F(fmin); extern float __attribute__((overloadable)) fmod(float, float); DEF_FUNC_2(fmod) -static float __attribute__((overloadable)) fract(float v, float *iptr) { +_RS_STATIC float __attribute__((overloadable)) fract(float v, float *iptr) { int i = (int)floor(v); iptr[0] = i; return fmin(v - i, 0x1.fffffep-1f); } -static float2 __attribute__((overloadable)) fract(float2 v, float2 *iptr) { +_RS_STATIC float2 __attribute__((overloadable)) fract(float2 v, float2 *iptr) { float t[2]; float2 r; r.x = fract(v.x, &t[0]); @@ -253,7 +258,7 @@ static float2 __attribute__((overloadable)) fract(float2 v, float2 *iptr) { iptr[1] = t[1]; return r; } -static float3 __attribute__((overloadable)) fract(float3 v, float3 *iptr) { +_RS_STATIC float3 __attribute__((overloadable)) fract(float3 v, float3 *iptr) { float t[3]; float3 r; r.x = fract(v.x, &t[0]); @@ -264,7 +269,7 @@ static float3 __attribute__((overloadable)) fract(float3 v, float3 *iptr) { iptr[2] = t[2]; return r; } -static float4 __attribute__((overloadable)) fract(float4 v, float4 *iptr) { +_RS_STATIC float4 __attribute__((overloadable)) fract(float4 v, float4 *iptr) { float t[4]; float4 r; r.x = fract(v.x, &t[0]); @@ -311,7 +316,7 @@ DEF_FUNC_1(log) extern float __attribute__((overloadable)) log10(float); DEF_FUNC_1(log10) -static float __attribute__((overloadable)) log2(float v) { +_RS_STATIC float __attribute__((overloadable)) log2(float v) { return log10(v) / log10(2.f); } DEF_FUNC_1(log2) @@ -339,29 +344,29 @@ DEF_FUNC_2(nextafter) DEF_FUNC_2(pow) -static float __attribute__((overloadable)) pown(float v, int p) { +_RS_STATIC float __attribute__((overloadable)) pown(float v, int p) { return pow(v, (float)p); } -static float2 __attribute__((overloadable)) pown(float2 v, int2 p) { +_RS_STATIC float2 __attribute__((overloadable)) pown(float2 v, int2 p) { return pow(v, (float2)p); } -static float3 __attribute__((overloadable)) pown(float3 v, int3 p) { +_RS_STATIC float3 __attribute__((overloadable)) pown(float3 v, int3 p) { return pow(v, (float3)p); } -static float4 __attribute__((overloadable)) pown(float4 v, int4 p) { +_RS_STATIC float4 __attribute__((overloadable)) pown(float4 v, int4 p) { return pow(v, (float4)p); } -static float __attribute__((overloadable)) powr(float v, float p) { +_RS_STATIC float __attribute__((overloadable)) powr(float v, float p) { return pow(v, p); } -static float2 __attribute__((overloadable)) powr(float2 v, float2 p) { +_RS_STATIC float2 __attribute__((overloadable)) powr(float2 v, float2 p) { return pow(v, p); } -static float3 __attribute__((overloadable)) powr(float3 v, float3 p) { +_RS_STATIC float3 __attribute__((overloadable)) powr(float3 v, float3 p) { return pow(v, p); } -static float4 __attribute__((overloadable)) powr(float4 v, float4 p) { +_RS_STATIC float4 __attribute__((overloadable)) powr(float4 v, float4 p) { return pow(v, p); } @@ -376,18 +381,18 @@ extern float4 __attribute__((overloadable)) remquo(float4, float4, int4 *); extern float __attribute__((overloadable)) rint(float); DEF_FUNC_1(rint) -static float __attribute__((overloadable)) rootn(float v, int r) { +_RS_STATIC float __attribute__((overloadable)) rootn(float v, int r) { return pow(v, 1.f / r); } -static float2 __attribute__((overloadable)) rootn(float2 v, int2 r) { +_RS_STATIC float2 __attribute__((overloadable)) rootn(float2 v, int2 r) { float2 t = {1.f / r.x, 1.f / r.y}; return pow(v, t); } -static float3 __attribute__((overloadable)) rootn(float3 v, int3 r) { +_RS_STATIC float3 __attribute__((overloadable)) rootn(float3 v, int3 r) { float3 t = {1.f / r.x, 1.f / r.y, 1.f / r.z}; return pow(v, t); } -static float4 __attribute__((overloadable)) rootn(float4 v, int4 r) { +_RS_STATIC float4 __attribute__((overloadable)) rootn(float4 v, int4 r) { float4 t = {1.f / r.x, 1.f / r.y, 1.f / r.z, 1.f / r.w}; return pow(v, t); } @@ -396,7 +401,7 @@ extern float __attribute__((overloadable)) round(float); DEF_FUNC_1(round) extern float __attribute__((overloadable)) sqrt(float); -static float __attribute__((overloadable)) rsqrt(float v) { +_RS_STATIC float __attribute__((overloadable)) rsqrt(float v) { return 1.f / sqrt(v); } DEF_FUNC_1(rsqrt) @@ -404,19 +409,19 @@ DEF_FUNC_1(rsqrt) extern float __attribute__((overloadable)) sin(float); DEF_FUNC_1(sin) -static float __attribute__((overloadable)) sincos(float v, float *cosptr) { +_RS_STATIC float __attribute__((overloadable)) sincos(float v, float *cosptr) { *cosptr = cos(v); return sin(v); } -static float2 __attribute__((overloadable)) sincos(float2 v, float2 *cosptr) { +_RS_STATIC float2 __attribute__((overloadable)) sincos(float2 v, float2 *cosptr) { *cosptr = cos(v); return sin(v); } -static float3 __attribute__((overloadable)) sincos(float3 v, float3 *cosptr) { +_RS_STATIC float3 __attribute__((overloadable)) sincos(float3 v, float3 *cosptr) { *cosptr = cos(v); return sin(v); } -static float4 __attribute__((overloadable)) sincos(float4 v, float4 *cosptr) { +_RS_STATIC float4 __attribute__((overloadable)) sincos(float4 v, float4 *cosptr) { *cosptr = cos(v); return sin(v); } @@ -424,7 +429,7 @@ static float4 __attribute__((overloadable)) sincos(float4 v, float4 *cosptr) { extern float __attribute__((overloadable)) sinh(float); DEF_FUNC_1(sinh) -static float __attribute__((overloadable)) sinpi(float v) { +_RS_STATIC float __attribute__((overloadable)) sinpi(float v) { return sin(v * M_PI); } DEF_FUNC_1(sinpi) @@ -437,7 +442,7 @@ DEF_FUNC_1(tan) extern float __attribute__((overloadable)) tanh(float); DEF_FUNC_1(tanh) -static float __attribute__((overloadable)) tanpi(float v) { +_RS_STATIC float __attribute__((overloadable)) tanpi(float v) { return tan(v * M_PI); } DEF_FUNC_1(tanpi) @@ -452,20 +457,20 @@ DEF_FUNC_1(trunc) #define DEF_RIFUNC_1(typeout, typein, fnc) \ extern typeout __attribute__((overloadable)) fnc(typein); \ -static typeout##2 __attribute__((overloadable)) fnc(typein##2 v) { \ +_RS_STATIC typeout##2 __attribute__((overloadable)) fnc(typein##2 v) { \ typeout##2 r; \ r.x = fnc(v.x); \ r.y = fnc(v.y); \ return r; \ } \ -static typeout##3 __attribute__((overloadable)) fnc(typein##3 v) { \ +_RS_STATIC typeout##3 __attribute__((overloadable)) fnc(typein##3 v) { \ typeout##3 r; \ r.x = fnc(v.x); \ r.y = fnc(v.y); \ r.z = fnc(v.z); \ return r; \ } \ -static typeout##4 __attribute__((overloadable)) fnc(typein##4 v) { \ +_RS_STATIC typeout##4 __attribute__((overloadable)) fnc(typein##4 v) { \ typeout##4 r; \ r.x = fnc(v.x); \ r.y = fnc(v.y); \ @@ -488,23 +493,23 @@ DEF_RIFUNC_1(uint, uint, fnc) \ DEF_RIFUNC_1(int, int, fnc) #define DEF_RIFUNC_2(type, fnc, body) \ -static type __attribute__((overloadable)) fnc(type v1, type v2) { \ +_RS_STATIC type __attribute__((overloadable)) fnc(type v1, type v2) { \ return body; \ } \ -static type##2 __attribute__((overloadable)) fnc(type##2 v1, type##2 v2) { \ +_RS_STATIC type##2 __attribute__((overloadable)) fnc(type##2 v1, type##2 v2) { \ type##2 r; \ r.x = fnc(v1.x, v2.x); \ r.y = fnc(v1.y, v2.y); \ return r; \ } \ -static type##3 __attribute__((overloadable)) fnc(type##3 v1, type##3 v2) { \ +_RS_STATIC type##3 __attribute__((overloadable)) fnc(type##3 v1, type##3 v2) { \ type##3 r; \ r.x = fnc(v1.x, v2.x); \ r.y = fnc(v1.y, v2.y); \ r.z = fnc(v1.z, v2.z); \ return r; \ } \ -static type##4 __attribute__((overloadable)) fnc(type##4 v1, type##4 v2) { \ +_RS_STATIC type##4 __attribute__((overloadable)) fnc(type##4 v1, type##4 v2) { \ type##4 r; \ r.x = fnc(v1.x, v2.x); \ r.y = fnc(v1.y, v2.y); \ @@ -533,23 +538,23 @@ DEF_FUNC_2F(max) // 6.11.4 -static float __attribute__((overloadable)) clamp(float amount, float low, float high) { +_RS_STATIC float __attribute__((overloadable)) clamp(float amount, float low, float high) { return amount < low ? low : (amount > high ? high : amount); } -static float2 __attribute__((overloadable)) clamp(float2 amount, float2 low, float2 high) { +_RS_STATIC float2 __attribute__((overloadable)) clamp(float2 amount, float2 low, float2 high) { float2 r; r.x = amount.x < low.x ? low.x : (amount.x > high.x ? high.x : amount.x); r.y = amount.y < low.y ? low.y : (amount.y > high.y ? high.y : amount.y); return r; } -static float3 __attribute__((overloadable)) clamp(float3 amount, float3 low, float3 high) { +_RS_STATIC float3 __attribute__((overloadable)) clamp(float3 amount, float3 low, float3 high) { float3 r; r.x = amount.x < low.x ? low.x : (amount.x > high.x ? high.x : amount.x); r.y = amount.y < low.y ? low.y : (amount.y > high.y ? high.y : amount.y); r.z = amount.z < low.z ? low.z : (amount.z > high.z ? high.z : amount.z); return r; } -static float4 __attribute__((overloadable)) clamp(float4 amount, float4 low, float4 high) { +_RS_STATIC float4 __attribute__((overloadable)) clamp(float4 amount, float4 low, float4 high) { float4 r; r.x = amount.x < low.x ? low.x : (amount.x > high.x ? high.x : amount.x); r.y = amount.y < low.y ? low.y : (amount.y > high.y ? high.y : amount.y); @@ -557,20 +562,20 @@ static float4 __attribute__((overloadable)) clamp(float4 amount, float4 low, flo r.w = amount.w < low.w ? low.w : (amount.w > high.w ? high.w : amount.w); return r; } -static float2 __attribute__((overloadable)) clamp(float2 amount, float low, float high) { +_RS_STATIC float2 __attribute__((overloadable)) clamp(float2 amount, float low, float high) { float2 r; r.x = amount.x < low ? low : (amount.x > high ? high : amount.x); r.y = amount.y < low ? low : (amount.y > high ? high : amount.y); return r; } -static float3 __attribute__((overloadable)) clamp(float3 amount, float low, float high) { +_RS_STATIC float3 __attribute__((overloadable)) clamp(float3 amount, float low, float high) { float3 r; r.x = amount.x < low ? low : (amount.x > high ? high : amount.x); r.y = amount.y < low ? low : (amount.y > high ? high : amount.y); r.z = amount.z < low ? low : (amount.z > high ? high : amount.z); return r; } -static float4 __attribute__((overloadable)) clamp(float4 amount, float low, float high) { +_RS_STATIC float4 __attribute__((overloadable)) clamp(float4 amount, float low, float high) { float4 r; r.x = amount.x < low ? low : (amount.x > high ? high : amount.x); r.y = amount.y < low ? low : (amount.y > high ? high : amount.y); @@ -579,55 +584,55 @@ static float4 __attribute__((overloadable)) clamp(float4 amount, float low, floa return r; } -static float __attribute__((overloadable)) degrees(float radians) { +_RS_STATIC float __attribute__((overloadable)) degrees(float radians) { return radians * (180.f / M_PI); } DEF_FUNC_1(degrees) -static float __attribute__((overloadable)) mix(float start, float stop, float amount) { +_RS_STATIC float __attribute__((overloadable)) mix(float start, float stop, float amount) { return start + (stop - start) * amount; } -static float2 __attribute__((overloadable)) mix(float2 start, float2 stop, float2 amount) { +_RS_STATIC float2 __attribute__((overloadable)) mix(float2 start, float2 stop, float2 amount) { return start + (stop - start) * amount; } -static float3 __attribute__((overloadable)) mix(float3 start, float3 stop, float3 amount) { +_RS_STATIC float3 __attribute__((overloadable)) mix(float3 start, float3 stop, float3 amount) { return start + (stop - start) * amount; } -static float4 __attribute__((overloadable)) mix(float4 start, float4 stop, float4 amount) { +_RS_STATIC float4 __attribute__((overloadable)) mix(float4 start, float4 stop, float4 amount) { return start + (stop - start) * amount; } -static float2 __attribute__((overloadable)) mix(float2 start, float2 stop, float amount) { +_RS_STATIC float2 __attribute__((overloadable)) mix(float2 start, float2 stop, float amount) { return start + (stop - start) * amount; } -static float3 __attribute__((overloadable)) mix(float3 start, float3 stop, float amount) { +_RS_STATIC float3 __attribute__((overloadable)) mix(float3 start, float3 stop, float amount) { return start + (stop - start) * amount; } -static float4 __attribute__((overloadable)) mix(float4 start, float4 stop, float amount) { +_RS_STATIC float4 __attribute__((overloadable)) mix(float4 start, float4 stop, float amount) { return start + (stop - start) * amount; } -static float __attribute__((overloadable)) radians(float degrees) { +_RS_STATIC float __attribute__((overloadable)) radians(float degrees) { return degrees * (M_PI / 180.f); } DEF_FUNC_1(radians) -static float __attribute__((overloadable)) step(float edge, float v) { +_RS_STATIC float __attribute__((overloadable)) step(float edge, float v) { return (v < edge) ? 0.f : 1.f; } -static float2 __attribute__((overloadable)) step(float2 edge, float2 v) { +_RS_STATIC float2 __attribute__((overloadable)) step(float2 edge, float2 v) { float2 r; r.x = (v.x < edge.x) ? 0.f : 1.f; r.y = (v.y < edge.y) ? 0.f : 1.f; return r; } -static float3 __attribute__((overloadable)) step(float3 edge, float3 v) { +_RS_STATIC float3 __attribute__((overloadable)) step(float3 edge, float3 v) { float3 r; r.x = (v.x < edge.x) ? 0.f : 1.f; r.y = (v.y < edge.y) ? 0.f : 1.f; r.z = (v.z < edge.z) ? 0.f : 1.f; return r; } -static float4 __attribute__((overloadable)) step(float4 edge, float4 v) { +_RS_STATIC float4 __attribute__((overloadable)) step(float4 edge, float4 v) { float4 r; r.x = (v.x < edge.x) ? 0.f : 1.f; r.y = (v.y < edge.y) ? 0.f : 1.f; @@ -635,20 +640,20 @@ static float4 __attribute__((overloadable)) step(float4 edge, float4 v) { r.w = (v.w < edge.w) ? 0.f : 1.f; return r; } -static float2 __attribute__((overloadable)) step(float2 edge, float v) { +_RS_STATIC float2 __attribute__((overloadable)) step(float2 edge, float v) { float2 r; r.x = (v < edge.x) ? 0.f : 1.f; r.y = (v < edge.y) ? 0.f : 1.f; return r; } -static float3 __attribute__((overloadable)) step(float3 edge, float v) { +_RS_STATIC float3 __attribute__((overloadable)) step(float3 edge, float v) { float3 r; r.x = (v < edge.x) ? 0.f : 1.f; r.y = (v < edge.y) ? 0.f : 1.f; r.z = (v < edge.z) ? 0.f : 1.f; return r; } -static float4 __attribute__((overloadable)) step(float4 edge, float v) { +_RS_STATIC float4 __attribute__((overloadable)) step(float4 edge, float v) { float4 r; r.x = (v < edge.x) ? 0.f : 1.f; r.y = (v < edge.y) ? 0.f : 1.f; @@ -665,7 +670,7 @@ extern float2 __attribute__((overloadable)) smoothstep(float, float, float2); extern float3 __attribute__((overloadable)) smoothstep(float, float, float3); extern float4 __attribute__((overloadable)) smoothstep(float, float, float4); -static float __attribute__((overloadable)) sign(float v) { +_RS_STATIC float __attribute__((overloadable)) sign(float v) { if (v > 0) return 1.f; if (v < 0) return -1.f; return v; @@ -673,7 +678,7 @@ static float __attribute__((overloadable)) sign(float v) { DEF_FUNC_1(sign) // 6.11.5 -static float3 __attribute__((overloadable)) cross(float3 lhs, float3 rhs) { +_RS_STATIC float3 __attribute__((overloadable)) cross(float3 lhs, float3 rhs) { float3 r; r.x = lhs.y * rhs.z - lhs.z * rhs.y; r.y = lhs.z * rhs.x - lhs.x * rhs.z; @@ -681,7 +686,7 @@ static float3 __attribute__((overloadable)) cross(float3 lhs, float3 rhs) { return r; } -static float4 __attribute__((overloadable)) cross(float4 lhs, float4 rhs) { +_RS_STATIC float4 __attribute__((overloadable)) cross(float4 lhs, float4 rhs) { float4 r; r.x = lhs.y * rhs.z - lhs.z * rhs.y; r.y = lhs.z * rhs.x - lhs.x * rhs.z; @@ -690,55 +695,55 @@ static float4 __attribute__((overloadable)) cross(float4 lhs, float4 rhs) { return r; } -static float __attribute__((overloadable)) dot(float lhs, float rhs) { +_RS_STATIC float __attribute__((overloadable)) dot(float lhs, float rhs) { return lhs * rhs; } -static float __attribute__((overloadable)) dot(float2 lhs, float2 rhs) { +_RS_STATIC float __attribute__((overloadable)) dot(float2 lhs, float2 rhs) { return lhs.x*rhs.x + lhs.y*rhs.y; } -static float __attribute__((overloadable)) dot(float3 lhs, float3 rhs) { +_RS_STATIC float __attribute__((overloadable)) dot(float3 lhs, float3 rhs) { return lhs.x*rhs.x + lhs.y*rhs.y + lhs.z*rhs.z; } -static float __attribute__((overloadable)) dot(float4 lhs, float4 rhs) { +_RS_STATIC float __attribute__((overloadable)) dot(float4 lhs, float4 rhs) { return lhs.x*rhs.x + lhs.y*rhs.y + lhs.z*rhs.z + lhs.w*rhs.w; } -static float __attribute__((overloadable)) length(float v) { +_RS_STATIC float __attribute__((overloadable)) length(float v) { return v; } -static float __attribute__((overloadable)) length(float2 v) { +_RS_STATIC float __attribute__((overloadable)) length(float2 v) { return sqrt(v.x*v.x + v.y*v.y); } -static float __attribute__((overloadable)) length(float3 v) { +_RS_STATIC float __attribute__((overloadable)) length(float3 v) { return sqrt(v.x*v.x + v.y*v.y + v.z*v.z); } -static float __attribute__((overloadable)) length(float4 v) { +_RS_STATIC float __attribute__((overloadable)) length(float4 v) { return sqrt(v.x*v.x + v.y*v.y + v.z*v.z + v.w*v.w); } -static float __attribute__((overloadable)) distance(float lhs, float rhs) { +_RS_STATIC float __attribute__((overloadable)) distance(float lhs, float rhs) { return length(lhs - rhs); } -static float __attribute__((overloadable)) distance(float2 lhs, float2 rhs) { +_RS_STATIC float __attribute__((overloadable)) distance(float2 lhs, float2 rhs) { return length(lhs - rhs); } -static float __attribute__((overloadable)) distance(float3 lhs, float3 rhs) { +_RS_STATIC float __attribute__((overloadable)) distance(float3 lhs, float3 rhs) { return length(lhs - rhs); } -static float __attribute__((overloadable)) distance(float4 lhs, float4 rhs) { +_RS_STATIC float __attribute__((overloadable)) distance(float4 lhs, float4 rhs) { return length(lhs - rhs); } -static float __attribute__((overloadable)) normalize(float v) { +_RS_STATIC float __attribute__((overloadable)) normalize(float v) { return 1.f; } -static float2 __attribute__((overloadable)) normalize(float2 v) { +_RS_STATIC float2 __attribute__((overloadable)) normalize(float2 v) { return v / length(v); } -static float3 __attribute__((overloadable)) normalize(float3 v) { +_RS_STATIC float3 __attribute__((overloadable)) normalize(float3 v) { return v / length(v); } -static float4 __attribute__((overloadable)) normalize(float4 v) { +_RS_STATIC float4 __attribute__((overloadable)) normalize(float4 v) { return v / length(v); } @@ -753,5 +758,6 @@ static float4 __attribute__((overloadable)) normalize(float4 v) { #undef DEF_IFUNC_1 #undef DEF_RIFUNC_2 #undef DEF_IFUNC_2 +#undef _RS_STATIC #endif diff --git a/libs/rs/scriptc/rs_core.rsh b/libs/rs/scriptc/rs_core.rsh index 16482c1..f3e0ab0 100644 --- a/libs/rs/scriptc/rs_core.rsh +++ b/libs/rs/scriptc/rs_core.rsh @@ -1,6 +1,12 @@ #ifndef __RS_CORE_RSH__ #define __RS_CORE_RSH__ +#ifdef BCC_PREPARE_BC +#define _RS_STATIC extern +#else +#define _RS_STATIC static +#endif + // Debugging, print to the LOG a description string and a value. extern void __attribute__((overloadable)) rsDebug(const char *, float); @@ -35,17 +41,17 @@ extern void __attribute__((overloadable)) #define RS_DEBUG(a) rsDebug(#a, a) #define RS_DEBUG_MARKER rsDebug(__FILE__, __LINE__) -static void __attribute__((overloadable)) rsDebug(const char *s, float2 v) { +_RS_STATIC void __attribute__((overloadable)) rsDebug(const char *s, float2 v) { rsDebug(s, v.x, v.y); } -static void __attribute__((overloadable)) rsDebug(const char *s, float3 v) { +_RS_STATIC void __attribute__((overloadable)) rsDebug(const char *s, float3 v) { rsDebug(s, v.x, v.y, v.z); } -static void __attribute__((overloadable)) rsDebug(const char *s, float4 v) { +_RS_STATIC void __attribute__((overloadable)) rsDebug(const char *s, float4 v) { rsDebug(s, v.x, v.y, v.z, v.w); } -static uchar4 __attribute__((overloadable)) rsPackColorTo8888(float r, float g, float b) +_RS_STATIC uchar4 __attribute__((overloadable)) rsPackColorTo8888(float r, float g, float b) { uchar4 c; c.x = (uchar)(r * 255.f); @@ -55,7 +61,7 @@ static uchar4 __attribute__((overloadable)) rsPackColorTo8888(float r, float g, return c; } -static uchar4 __attribute__((overloadable)) rsPackColorTo8888(float r, float g, float b, float a) +_RS_STATIC uchar4 __attribute__((overloadable)) rsPackColorTo8888(float r, float g, float b, float a) { uchar4 c; c.x = (uchar)(r * 255.f); @@ -65,21 +71,21 @@ static uchar4 __attribute__((overloadable)) rsPackColorTo8888(float r, float g, return c; } -static uchar4 __attribute__((overloadable)) rsPackColorTo8888(float3 color) +_RS_STATIC uchar4 __attribute__((overloadable)) rsPackColorTo8888(float3 color) { color *= 255.f; uchar4 c = {color.x, color.y, color.z, 255}; return c; } -static uchar4 __attribute__((overloadable)) rsPackColorTo8888(float4 color) +_RS_STATIC uchar4 __attribute__((overloadable)) rsPackColorTo8888(float4 color) { color *= 255.f; uchar4 c = {color.x, color.y, color.z, color.w}; return c; } -static float4 rsUnpackColor8888(uchar4 c) +_RS_STATIC float4 rsUnpackColor8888(uchar4 c) { float4 ret = (float4)0.0039156862745f; ret *= convert_float4(c); @@ -95,37 +101,37 @@ static float4 rsUnpackColor8888(uchar4 c) // Matrix ops ///////////////////////////////////////////////////// -static void __attribute__((overloadable)) +_RS_STATIC void __attribute__((overloadable)) rsMatrixSet(rs_matrix4x4 *m, uint32_t row, uint32_t col, float v) { m->m[row * 4 + col] = v; } -static float __attribute__((overloadable)) +_RS_STATIC float __attribute__((overloadable)) rsMatrixGet(const rs_matrix4x4 *m, uint32_t row, uint32_t col) { return m->m[row * 4 + col]; } -static void __attribute__((overloadable)) +_RS_STATIC void __attribute__((overloadable)) rsMatrixSet(rs_matrix3x3 *m, uint32_t row, uint32_t col, float v) { m->m[row * 3 + col] = v; } -static float __attribute__((overloadable)) +_RS_STATIC float __attribute__((overloadable)) rsMatrixGet(const rs_matrix3x3 *m, uint32_t row, uint32_t col) { return m->m[row * 3 + col]; } -static void __attribute__((overloadable)) +_RS_STATIC void __attribute__((overloadable)) rsMatrixSet(rs_matrix2x2 *m, uint32_t row, uint32_t col, float v) { m->m[row * 2 + col] = v; } -static float __attribute__((overloadable)) +_RS_STATIC float __attribute__((overloadable)) rsMatrixGet(const rs_matrix2x2 *m, uint32_t row, uint32_t col) { return m->m[row * 2 + col]; } -static void __attribute__((overloadable)) +_RS_STATIC void __attribute__((overloadable)) rsMatrixLoadIdentity(rs_matrix4x4 *m) { m->m[0] = 1.f; m->m[1] = 0.f; @@ -145,7 +151,7 @@ rsMatrixLoadIdentity(rs_matrix4x4 *m) { m->m[15] = 1.f; } -static void __attribute__((overloadable)) +_RS_STATIC void __attribute__((overloadable)) rsMatrixLoadIdentity(rs_matrix3x3 *m) { m->m[0] = 1.f; m->m[1] = 0.f; @@ -158,7 +164,7 @@ rsMatrixLoadIdentity(rs_matrix3x3 *m) { m->m[8] = 1.f; } -static void __attribute__((overloadable)) +_RS_STATIC void __attribute__((overloadable)) rsMatrixLoadIdentity(rs_matrix2x2 *m) { m->m[0] = 1.f; m->m[1] = 0.f; @@ -166,7 +172,7 @@ rsMatrixLoadIdentity(rs_matrix2x2 *m) { m->m[3] = 1.f; } -static void __attribute__((overloadable)) +_RS_STATIC void __attribute__((overloadable)) rsMatrixLoad(rs_matrix4x4 *m, const float *v) { m->m[0] = v[0]; m->m[1] = v[1]; @@ -186,7 +192,7 @@ rsMatrixLoad(rs_matrix4x4 *m, const float *v) { m->m[15] = v[15]; } -static void __attribute__((overloadable)) +_RS_STATIC void __attribute__((overloadable)) rsMatrixLoad(rs_matrix3x3 *m, const float *v) { m->m[0] = v[0]; m->m[1] = v[1]; @@ -199,7 +205,7 @@ rsMatrixLoad(rs_matrix3x3 *m, const float *v) { m->m[8] = v[8]; } -static void __attribute__((overloadable)) +_RS_STATIC void __attribute__((overloadable)) rsMatrixLoad(rs_matrix2x2 *m, const float *v) { m->m[0] = v[0]; m->m[1] = v[1]; @@ -207,7 +213,7 @@ rsMatrixLoad(rs_matrix2x2 *m, const float *v) { m->m[3] = v[3]; } -static void __attribute__((overloadable)) +_RS_STATIC void __attribute__((overloadable)) rsMatrixLoad(rs_matrix4x4 *m, const rs_matrix4x4 *v) { m->m[0] = v->m[0]; m->m[1] = v->m[1]; @@ -227,7 +233,7 @@ rsMatrixLoad(rs_matrix4x4 *m, const rs_matrix4x4 *v) { m->m[15] = v->m[15]; } -static void __attribute__((overloadable)) +_RS_STATIC void __attribute__((overloadable)) rsMatrixLoad(rs_matrix4x4 *m, const rs_matrix3x3 *v) { m->m[0] = v->m[0]; m->m[1] = v->m[1]; @@ -247,7 +253,7 @@ rsMatrixLoad(rs_matrix4x4 *m, const rs_matrix3x3 *v) { m->m[15] = 1.f; } -static void __attribute__((overloadable)) +_RS_STATIC void __attribute__((overloadable)) rsMatrixLoad(rs_matrix4x4 *m, const rs_matrix2x2 *v) { m->m[0] = v->m[0]; m->m[1] = v->m[1]; @@ -267,7 +273,7 @@ rsMatrixLoad(rs_matrix4x4 *m, const rs_matrix2x2 *v) { m->m[15] = 1.f; } -static void __attribute__((overloadable)) +_RS_STATIC void __attribute__((overloadable)) rsMatrixLoad(rs_matrix3x3 *m, const rs_matrix3x3 *v) { m->m[0] = v->m[0]; m->m[1] = v->m[1]; @@ -280,7 +286,7 @@ rsMatrixLoad(rs_matrix3x3 *m, const rs_matrix3x3 *v) { m->m[8] = v->m[8]; } -static void __attribute__((overloadable)) +_RS_STATIC void __attribute__((overloadable)) rsMatrixLoad(rs_matrix2x2 *m, const rs_matrix2x2 *v) { m->m[0] = v->m[0]; m->m[1] = v->m[1]; @@ -288,7 +294,7 @@ rsMatrixLoad(rs_matrix2x2 *m, const rs_matrix2x2 *v) { m->m[3] = v->m[3]; } -static void __attribute__((overloadable)) +_RS_STATIC void __attribute__((overloadable)) rsMatrixLoadRotate(rs_matrix4x4 *m, float rot, float x, float y, float z) { float c, s; m->m[3] = 0; @@ -327,7 +333,7 @@ rsMatrixLoadRotate(rs_matrix4x4 *m, float rot, float x, float y, float z) { m->m[10] = z*z*nc + c; } -static void __attribute__((overloadable)) +_RS_STATIC void __attribute__((overloadable)) rsMatrixLoadScale(rs_matrix4x4 *m, float x, float y, float z) { rsMatrixLoadIdentity(m); m->m[0] = x; @@ -335,7 +341,7 @@ rsMatrixLoadScale(rs_matrix4x4 *m, float x, float y, float z) { m->m[10] = z; } -static void __attribute__((overloadable)) +_RS_STATIC void __attribute__((overloadable)) rsMatrixLoadTranslate(rs_matrix4x4 *m, float x, float y, float z) { rsMatrixLoadIdentity(m); m->m[12] = x; @@ -343,7 +349,7 @@ rsMatrixLoadTranslate(rs_matrix4x4 *m, float x, float y, float z) { m->m[14] = z; } -static void __attribute__((overloadable)) +_RS_STATIC void __attribute__((overloadable)) rsMatrixLoadMultiply(rs_matrix4x4 *m, const rs_matrix4x4 *lhs, const rs_matrix4x4 *rhs) { for (int i=0 ; i<4 ; i++) { float ri0 = 0; @@ -364,14 +370,14 @@ rsMatrixLoadMultiply(rs_matrix4x4 *m, const rs_matrix4x4 *lhs, const rs_matrix4x } } -static void __attribute__((overloadable)) +_RS_STATIC void __attribute__((overloadable)) rsMatrixMultiply(rs_matrix4x4 *m, const rs_matrix4x4 *rhs) { rs_matrix4x4 mt; rsMatrixLoadMultiply(&mt, m, rhs); rsMatrixLoad(m, &mt); } -static void __attribute__((overloadable)) +_RS_STATIC void __attribute__((overloadable)) rsMatrixLoadMultiply(rs_matrix3x3 *m, const rs_matrix3x3 *lhs, const rs_matrix3x3 *rhs) { for (int i=0 ; i<3 ; i++) { float ri0 = 0; @@ -389,14 +395,14 @@ rsMatrixLoadMultiply(rs_matrix3x3 *m, const rs_matrix3x3 *lhs, const rs_matrix3x } } -static void __attribute__((overloadable)) +_RS_STATIC void __attribute__((overloadable)) rsMatrixMultiply(rs_matrix3x3 *m, const rs_matrix3x3 *rhs) { rs_matrix3x3 mt; rsMatrixLoadMultiply(&mt, m, rhs); rsMatrixLoad(m, &mt); } -static void __attribute__((overloadable)) +_RS_STATIC void __attribute__((overloadable)) rsMatrixLoadMultiply(rs_matrix2x2 *m, const rs_matrix2x2 *lhs, const rs_matrix2x2 *rhs) { for (int i=0 ; i<2 ; i++) { float ri0 = 0; @@ -411,35 +417,35 @@ rsMatrixLoadMultiply(rs_matrix2x2 *m, const rs_matrix2x2 *lhs, const rs_matrix2x } } -static void __attribute__((overloadable)) +_RS_STATIC void __attribute__((overloadable)) rsMatrixMultiply(rs_matrix2x2 *m, const rs_matrix2x2 *rhs) { rs_matrix2x2 mt; rsMatrixLoadMultiply(&mt, m, rhs); rsMatrixLoad(m, &mt); } -static void __attribute__((overloadable)) +_RS_STATIC void __attribute__((overloadable)) rsMatrixRotate(rs_matrix4x4 *m, float rot, float x, float y, float z) { rs_matrix4x4 m1; rsMatrixLoadRotate(&m1, rot, x, y, z); rsMatrixMultiply(m, &m1); } -static void __attribute__((overloadable)) +_RS_STATIC void __attribute__((overloadable)) rsMatrixScale(rs_matrix4x4 *m, float x, float y, float z) { rs_matrix4x4 m1; rsMatrixLoadScale(&m1, x, y, z); rsMatrixMultiply(m, &m1); } -static void __attribute__((overloadable)) +_RS_STATIC void __attribute__((overloadable)) rsMatrixTranslate(rs_matrix4x4 *m, float x, float y, float z) { rs_matrix4x4 m1; rsMatrixLoadTranslate(&m1, x, y, z); rsMatrixMultiply(m, &m1); } -static void __attribute__((overloadable)) +_RS_STATIC void __attribute__((overloadable)) rsMatrixLoadOrtho(rs_matrix4x4 *m, float left, float right, float bottom, float top, float near, float far) { rsMatrixLoadIdentity(m); m->m[0] = 2.f / (right - left); @@ -450,7 +456,7 @@ rsMatrixLoadOrtho(rs_matrix4x4 *m, float left, float right, float bottom, float m->m[14]= -(far + near) / (far - near); } -static void __attribute__((overloadable)) +_RS_STATIC void __attribute__((overloadable)) rsMatrixLoadFrustum(rs_matrix4x4 *m, float left, float right, float bottom, float top, float near, float far) { rsMatrixLoadIdentity(m); m->m[0] = 2.f * near / (right - left); @@ -463,7 +469,7 @@ rsMatrixLoadFrustum(rs_matrix4x4 *m, float left, float right, float bottom, floa m->m[15]= 0.f; } -static void __attribute__((overloadable)) +_RS_STATIC void __attribute__((overloadable)) rsMatrixLoadPerspective(rs_matrix4x4* m, float fovy, float aspect, float near, float far) { float top = near * tan((float) (fovy * M_PI / 360.0f)); float bottom = -top; @@ -472,7 +478,7 @@ rsMatrixLoadPerspective(rs_matrix4x4* m, float fovy, float aspect, float near, f rsMatrixLoadFrustum(m, left, right, bottom, top, near, far); } -static float4 __attribute__((overloadable)) +_RS_STATIC float4 __attribute__((overloadable)) rsMatrixMultiply(rs_matrix4x4 *m, float4 in) { float4 ret; ret.x = (m->m[0] * in.x) + (m->m[4] * in.y) + (m->m[8] * in.z) + (m->m[12] * in.w); @@ -482,7 +488,7 @@ rsMatrixMultiply(rs_matrix4x4 *m, float4 in) { return ret; } -static float4 __attribute__((overloadable)) +_RS_STATIC float4 __attribute__((overloadable)) rsMatrixMultiply(rs_matrix4x4 *m, float3 in) { float4 ret; ret.x = (m->m[0] * in.x) + (m->m[4] * in.y) + (m->m[8] * in.z) + m->m[12]; @@ -492,7 +498,7 @@ rsMatrixMultiply(rs_matrix4x4 *m, float3 in) { return ret; } -static float4 __attribute__((overloadable)) +_RS_STATIC float4 __attribute__((overloadable)) rsMatrixMultiply(rs_matrix4x4 *m, float2 in) { float4 ret; ret.x = (m->m[0] * in.x) + (m->m[4] * in.y) + m->m[12]; @@ -502,7 +508,7 @@ rsMatrixMultiply(rs_matrix4x4 *m, float2 in) { return ret; } -static float3 __attribute__((overloadable)) +_RS_STATIC float3 __attribute__((overloadable)) rsMatrixMultiply(rs_matrix3x3 *m, float3 in) { float3 ret; ret.x = (m->m[0] * in.x) + (m->m[3] * in.y) + (m->m[6] * in.z); @@ -511,7 +517,7 @@ rsMatrixMultiply(rs_matrix3x3 *m, float3 in) { return ret; } -static float3 __attribute__((overloadable)) +_RS_STATIC float3 __attribute__((overloadable)) rsMatrixMultiply(rs_matrix3x3 *m, float2 in) { float3 ret; ret.x = (m->m[0] * in.x) + (m->m[3] * in.y); @@ -520,7 +526,7 @@ rsMatrixMultiply(rs_matrix3x3 *m, float2 in) { return ret; } -static float2 __attribute__((overloadable)) +_RS_STATIC float2 __attribute__((overloadable)) rsMatrixMultiply(rs_matrix2x2 *m, float2 in) { float2 ret; ret.x = (m->m[0] * in.x) + (m->m[2] * in.y); @@ -529,7 +535,7 @@ rsMatrixMultiply(rs_matrix2x2 *m, float2 in) { } // Returns true if the matrix was successfully inversed -static bool __attribute__((overloadable)) +_RS_STATIC bool __attribute__((overloadable)) rsMatrixInverse(rs_matrix4x4 *m) { rs_matrix4x4 result; @@ -571,7 +577,7 @@ rsMatrixInverse(rs_matrix4x4 *m) { } // Returns true if the matrix was successfully inversed -static bool __attribute__((overloadable)) +_RS_STATIC bool __attribute__((overloadable)) rsMatrixInverseTranspose(rs_matrix4x4 *m) { rs_matrix4x4 result; @@ -612,7 +618,7 @@ rsMatrixInverseTranspose(rs_matrix4x4 *m) { return true; } -static void __attribute__((overloadable)) +_RS_STATIC void __attribute__((overloadable)) rsMatrixTranspose(rs_matrix4x4 *m) { int i, j; float temp; @@ -625,7 +631,7 @@ rsMatrixTranspose(rs_matrix4x4 *m) { } } -static void __attribute__((overloadable)) +_RS_STATIC void __attribute__((overloadable)) rsMatrixTranspose(rs_matrix3x3 *m) { int i, j; float temp; @@ -638,7 +644,7 @@ rsMatrixTranspose(rs_matrix3x3 *m) { } } -static void __attribute__((overloadable)) +_RS_STATIC void __attribute__((overloadable)) rsMatrixTranspose(rs_matrix2x2 *m) { float temp = m->m[1]; m->m[1] = m->m[2]; @@ -649,7 +655,7 @@ rsMatrixTranspose(rs_matrix2x2 *m) { // quaternion ops ///////////////////////////////////////////////////// -static void __attribute__((overloadable)) +_RS_STATIC void __attribute__((overloadable)) rsQuaternionSet(rs_quaternion *q, float w, float x, float y, float z) { q->w = w; q->x = x; @@ -657,7 +663,7 @@ rsQuaternionSet(rs_quaternion *q, float w, float x, float y, float z) { q->z = z; } -static void __attribute__((overloadable)) +_RS_STATIC void __attribute__((overloadable)) rsQuaternionSet(rs_quaternion *q, const rs_quaternion *rhs) { q->w = rhs->w; q->x = rhs->x; @@ -665,7 +671,7 @@ rsQuaternionSet(rs_quaternion *q, const rs_quaternion *rhs) { q->z = rhs->z; } -static void __attribute__((overloadable)) +_RS_STATIC void __attribute__((overloadable)) rsQuaternionMultiply(rs_quaternion *q, float s) { q->w *= s; q->x *= s; @@ -673,7 +679,7 @@ rsQuaternionMultiply(rs_quaternion *q, float s) { q->z *= s; } -static void __attribute__((overloadable)) +_RS_STATIC void __attribute__((overloadable)) rsQuaternionMultiply(rs_quaternion *q, const rs_quaternion *rhs) { q->w = -q->x*rhs->x - q->y*rhs->y - q->z*rhs->z + q->w*rhs->w; q->x = q->x*rhs->w + q->y*rhs->z - q->z*rhs->y + q->w*rhs->x; @@ -681,7 +687,7 @@ rsQuaternionMultiply(rs_quaternion *q, const rs_quaternion *rhs) { q->z = q->x*rhs->y - q->y*rhs->x + q->z*rhs->w + q->w*rhs->z; } -static void +_RS_STATIC void rsQuaternionAdd(rs_quaternion *q, const rs_quaternion *rhs) { q->w *= rhs->w; q->x *= rhs->x; @@ -689,7 +695,7 @@ rsQuaternionAdd(rs_quaternion *q, const rs_quaternion *rhs) { q->z *= rhs->z; } -static void +_RS_STATIC void rsQuaternionLoadRotateUnit(rs_quaternion *q, float rot, float x, float y, float z) { rot *= (float)(M_PI / 180.0f) * 0.5f; float c = cos(rot); @@ -701,7 +707,7 @@ rsQuaternionLoadRotateUnit(rs_quaternion *q, float rot, float x, float y, float q->z = z * s; } -static void +_RS_STATIC void rsQuaternionLoadRotate(rs_quaternion *q, float rot, float x, float y, float z) { const float len = x*x + y*y + z*z; if (len != 1) { @@ -713,19 +719,19 @@ rsQuaternionLoadRotate(rs_quaternion *q, float rot, float x, float y, float z) { rsQuaternionLoadRotateUnit(q, rot, x, y, z); } -static void +_RS_STATIC void rsQuaternionConjugate(rs_quaternion *q) { q->x = -q->x; q->y = -q->y; q->z = -q->z; } -static float +_RS_STATIC float rsQuaternionDot(const rs_quaternion *q0, const rs_quaternion *q1) { return q0->w*q1->w + q0->x*q1->x + q0->y*q1->y + q0->z*q1->z; } -static void +_RS_STATIC void rsQuaternionNormalize(rs_quaternion *q) { const float len = rsQuaternionDot(q, q); if (len != 1) { @@ -734,7 +740,7 @@ rsQuaternionNormalize(rs_quaternion *q) { } } -static void +_RS_STATIC void rsQuaternionSlerp(rs_quaternion *q, const rs_quaternion *q0, const rs_quaternion *q1, float t) { if (t <= 0.0f) { rsQuaternionSet(q, q0); @@ -776,7 +782,7 @@ rsQuaternionSlerp(rs_quaternion *q, const rs_quaternion *q0, const rs_quaternion tempq0.y*scale + tempq1.y*invScale, tempq0.z*scale + tempq1.z*invScale); } -static void rsQuaternionGetMatrixUnit(rs_matrix4x4 *m, const rs_quaternion *q) { +_RS_STATIC void rsQuaternionGetMatrixUnit(rs_matrix4x4 *m, const rs_quaternion *q) { float x2 = 2.0f * q->x * q->x; float y2 = 2.0f * q->y * q->y; float z2 = 2.0f * q->z * q->z; @@ -811,7 +817,7 @@ static void rsQuaternionGetMatrixUnit(rs_matrix4x4 *m, const rs_quaternion *q) { ///////////////////////////////////////////////////// // utility funcs ///////////////////////////////////////////////////// -__inline__ static void __attribute__((overloadable, always_inline)) +__inline__ _RS_STATIC void __attribute__((overloadable, always_inline)) rsExtractFrustumPlanes(const rs_matrix4x4 *modelViewProj, float4 *left, float4 *right, float4 *top, float4 *bottom, @@ -861,7 +867,7 @@ rsExtractFrustumPlanes(const rs_matrix4x4 *modelViewProj, *far /= len; } -__inline__ static bool __attribute__((overloadable, always_inline)) +__inline__ _RS_STATIC bool __attribute__((overloadable, always_inline)) rsIsSphereInFrustum(float4 *sphere, float4 *left, float4 *right, float4 *top, float4 *bottom, @@ -899,26 +905,26 @@ rsIsSphereInFrustum(float4 *sphere, // int ops ///////////////////////////////////////////////////// -__inline__ static uint __attribute__((overloadable, always_inline)) rsClamp(uint amount, uint low, uint high) { +__inline__ _RS_STATIC uint __attribute__((overloadable, always_inline)) rsClamp(uint amount, uint low, uint high) { return amount < low ? low : (amount > high ? high : amount); } -__inline__ static int __attribute__((overloadable, always_inline)) rsClamp(int amount, int low, int high) { +__inline__ _RS_STATIC int __attribute__((overloadable, always_inline)) rsClamp(int amount, int low, int high) { return amount < low ? low : (amount > high ? high : amount); } -__inline__ static ushort __attribute__((overloadable, always_inline)) rsClamp(ushort amount, ushort low, ushort high) { +__inline__ _RS_STATIC ushort __attribute__((overloadable, always_inline)) rsClamp(ushort amount, ushort low, ushort high) { return amount < low ? low : (amount > high ? high : amount); } -__inline__ static short __attribute__((overloadable, always_inline)) rsClamp(short amount, short low, short high) { +__inline__ _RS_STATIC short __attribute__((overloadable, always_inline)) rsClamp(short amount, short low, short high) { return amount < low ? low : (amount > high ? high : amount); } -__inline__ static uchar __attribute__((overloadable, always_inline)) rsClamp(uchar amount, uchar low, uchar high) { +__inline__ _RS_STATIC uchar __attribute__((overloadable, always_inline)) rsClamp(uchar amount, uchar low, uchar high) { return amount < low ? low : (amount > high ? high : amount); } -__inline__ static char __attribute__((overloadable, always_inline)) rsClamp(char amount, char low, char high) { +__inline__ _RS_STATIC char __attribute__((overloadable, always_inline)) rsClamp(char amount, char low, char high) { return amount < low ? low : (amount > high ? high : amount); } - +#undef _RS_STATIC #endif |