am 957ee34d: am b9d69d59: Merge "For rs_cl, fix _RS_STATIC (used while we do on-host linking). Now we do on-device linking, STATIC no longer makes sense. (b/2943524)" into honeycomb

* commit '957ee34d73e6b0bec91edaad57be641834855758':
  For rs_cl, fix _RS_STATIC (used while we do on-host linking). Now we do on-device linking, STATIC no longer makes sense. (b/2943524)

1 files changed, 111 insertions, 111 deletions

diff --git a/libs/rs/scriptc/rs_cl.rsh b/libs/rs/scriptc/rs_cl.rsh
index 3a9686b..d78e62e 100644
--- a/libs/rs/scriptc/rs_cl.rsh
+++ b/libs/rs/scriptc/rs_cl.rsh
@@ -1,15 +1,15 @@
 #ifndef __RS_CL_RSH__
 #define __RS_CL_RSH__
 
-#define _RS_STATIC  extern
+#define _RS_RUNTIME  extern
 
 // Conversions
 #define CVT_FUNC_2(typeout, typein)                             \
-_RS_STATIC typeout##2 __attribute__((overloadable))             \
+_RS_RUNTIME typeout##2 __attribute__((overloadable))             \
         convert_##typeout##2(typein##2 v);                      \
-_RS_STATIC typeout##3 __attribute__((overloadable))             \
+_RS_RUNTIME typeout##3 __attribute__((overloadable))             \
         convert_##typeout##3(typein##3 v);                      \
-_RS_STATIC typeout##4 __attribute__((overloadable))             \
+_RS_RUNTIME typeout##4 __attribute__((overloadable))             \
         convert_##typeout##4(typein##4 v);
 
 
@@ -32,62 +32,62 @@ CVT_FUNC(float)
 // Float ops, 6.11.2
 
 #define FN_FUNC_FN(fnc)                                         \
-_RS_STATIC float2 __attribute__((overloadable)) fnc(float2 v);  \
-_RS_STATIC float3 __attribute__((overloadable)) fnc(float3 v);  \
-_RS_STATIC float4 __attribute__((overloadable)) fnc(float4 v);
+_RS_RUNTIME float2 __attribute__((overloadable)) fnc(float2 v);  \
+_RS_RUNTIME float3 __attribute__((overloadable)) fnc(float3 v);  \
+_RS_RUNTIME float4 __attribute__((overloadable)) fnc(float4 v);
 
 #define IN_FUNC_FN(fnc)                                         \
-_RS_STATIC int2 __attribute__((overloadable)) fnc(float2 v);    \
-_RS_STATIC int3 __attribute__((overloadable)) fnc(float3 v);    \
-_RS_STATIC int4 __attribute__((overloadable)) fnc(float4 v);
+_RS_RUNTIME int2 __attribute__((overloadable)) fnc(float2 v);    \
+_RS_RUNTIME int3 __attribute__((overloadable)) fnc(float3 v);    \
+_RS_RUNTIME int4 __attribute__((overloadable)) fnc(float4 v);
 
 #define FN_FUNC_FN_FN(fnc)                                                  \
-_RS_STATIC float2 __attribute__((overloadable)) fnc(float2 v1, float2 v2);  \
-_RS_STATIC float3 __attribute__((overloadable)) fnc(float3 v1, float3 v2);  \
-_RS_STATIC float4 __attribute__((overloadable)) fnc(float4 v1, float4 v2);
+_RS_RUNTIME float2 __attribute__((overloadable)) fnc(float2 v1, float2 v2);  \
+_RS_RUNTIME float3 __attribute__((overloadable)) fnc(float3 v1, float3 v2);  \
+_RS_RUNTIME float4 __attribute__((overloadable)) fnc(float4 v1, float4 v2);
 
 #define FN_FUNC_FN_F(fnc)                                                   \
-_RS_STATIC float2 __attribute__((overloadable)) fnc(float2 v1, float v2);   \
-_RS_STATIC float3 __attribute__((overloadable)) fnc(float3 v1, float v2);   \
-_RS_STATIC float4 __attribute__((overloadable)) fnc(float4 v1, float v2);
+_RS_RUNTIME float2 __attribute__((overloadable)) fnc(float2 v1, float v2);   \
+_RS_RUNTIME float3 __attribute__((overloadable)) fnc(float3 v1, float v2);   \
+_RS_RUNTIME float4 __attribute__((overloadable)) fnc(float4 v1, float v2);
 
 #define FN_FUNC_FN_IN(fnc)                                                  \
-_RS_STATIC float2 __attribute__((overloadable)) fnc(float2 v1, int2 v2);    \
-_RS_STATIC float3 __attribute__((overloadable)) fnc(float3 v1, int3 v2);    \
-_RS_STATIC float4 __attribute__((overloadable)) fnc(float4 v1, int4 v2);    \
+_RS_RUNTIME float2 __attribute__((overloadable)) fnc(float2 v1, int2 v2);    \
+_RS_RUNTIME float3 __attribute__((overloadable)) fnc(float3 v1, int3 v2);    \
+_RS_RUNTIME float4 __attribute__((overloadable)) fnc(float4 v1, int4 v2);    \
 
 #define FN_FUNC_FN_I(fnc)                                                   \
-_RS_STATIC float2 __attribute__((overloadable)) fnc(float2 v1, int v2);     \
-_RS_STATIC float3 __attribute__((overloadable)) fnc(float3 v1, int v2);     \
-_RS_STATIC float4 __attribute__((overloadable)) fnc(float4 v1, int v2);
+_RS_RUNTIME float2 __attribute__((overloadable)) fnc(float2 v1, int v2);     \
+_RS_RUNTIME float3 __attribute__((overloadable)) fnc(float3 v1, int v2);     \
+_RS_RUNTIME float4 __attribute__((overloadable)) fnc(float4 v1, int v2);
 
 #define FN_FUNC_FN_PFN(fnc)                     \
-_RS_STATIC float2 __attribute__((overloadable)) \
+_RS_RUNTIME float2 __attribute__((overloadable)) \
         fnc(float2 v1, float2 *v2);             \
-_RS_STATIC float3 __attribute__((overloadable)) \
+_RS_RUNTIME float3 __attribute__((overloadable)) \
         fnc(float3 v1, float3 *v2);             \
-_RS_STATIC float4 __attribute__((overloadable)) \
+_RS_RUNTIME float4 __attribute__((overloadable)) \
         fnc(float4 v1, float4 *v2);
 
 #define FN_FUNC_FN_PIN(fnc)                                                 \
-_RS_STATIC float2 __attribute__((overloadable)) fnc(float2 v1, int2 *v2);   \
-_RS_STATIC float3 __attribute__((overloadable)) fnc(float3 v1, int3 *v2);   \
-_RS_STATIC float4 __attribute__((overloadable)) fnc(float4 v1, int4 *v2);
+_RS_RUNTIME float2 __attribute__((overloadable)) fnc(float2 v1, int2 *v2);   \
+_RS_RUNTIME float3 __attribute__((overloadable)) fnc(float3 v1, int3 *v2);   \
+_RS_RUNTIME float4 __attribute__((overloadable)) fnc(float4 v1, int4 *v2);
 
 #define FN_FUNC_FN_FN_FN(fnc)                   \
-_RS_STATIC float2 __attribute__((overloadable)) \
+_RS_RUNTIME float2 __attribute__((overloadable)) \
         fnc(float2 v1, float2 v2, float2 v3);   \
-_RS_STATIC float3 __attribute__((overloadable)) \
+_RS_RUNTIME float3 __attribute__((overloadable)) \
         fnc(float3 v1, float3 v2, float3 v3);   \
-_RS_STATIC float4 __attribute__((overloadable)) \
+_RS_RUNTIME float4 __attribute__((overloadable)) \
         fnc(float4 v1, float4 v2, float4 v3);
 
 #define FN_FUNC_FN_FN_PIN(fnc)                  \
-_RS_STATIC float2 __attribute__((overloadable)) \
+_RS_RUNTIME float2 __attribute__((overloadable)) \
         fnc(float2 v1, float2 v2, int2 *v3);    \
-_RS_STATIC float3 __attribute__((overloadable)) \
+_RS_RUNTIME float3 __attribute__((overloadable)) \
         fnc(float3 v1, float3 v2, int3 *v3);    \
-_RS_STATIC float4 __attribute__((overloadable)) \
+_RS_RUNTIME float4 __attribute__((overloadable)) \
         fnc(float4 v1, float4 v2, int4 *v3);
 
 
@@ -97,7 +97,7 @@ FN_FUNC_FN(acos)
 extern float __attribute__((overloadable)) acosh(float);
 FN_FUNC_FN(acosh)
 
-_RS_STATIC float __attribute__((overloadable)) acospi(float v);
+_RS_RUNTIME float __attribute__((overloadable)) acospi(float v);
 
 
 FN_FUNC_FN(acospi)
@@ -109,7 +109,7 @@ extern float __attribute__((overloadable)) asinh(float);
 FN_FUNC_FN(asinh)
 
 
-_RS_STATIC float __attribute__((overloadable)) asinpi(float v);
+_RS_RUNTIME float __attribute__((overloadable)) asinpi(float v);
 FN_FUNC_FN(asinpi)
 
 extern float __attribute__((overloadable)) atan(float);
@@ -122,11 +122,11 @@ extern float __attribute__((overloadable)) atanh(float);
 FN_FUNC_FN(atanh)
 
 
-_RS_STATIC float __attribute__((overloadable)) atanpi(float v);
+_RS_RUNTIME float __attribute__((overloadable)) atanpi(float v);
 FN_FUNC_FN(atanpi)
 
 
-_RS_STATIC float __attribute__((overloadable)) atan2pi(float y, float x);
+_RS_RUNTIME float __attribute__((overloadable)) atan2pi(float y, float x);
 FN_FUNC_FN_FN(atan2pi)
 
 extern float __attribute__((overloadable)) cbrt(float);
@@ -145,7 +145,7 @@ extern float __attribute__((overloadable)) cosh(float);
 FN_FUNC_FN(cosh)
 
 
-_RS_STATIC float __attribute__((overloadable)) cospi(float v);
+_RS_RUNTIME float __attribute__((overloadable)) cospi(float v);
 FN_FUNC_FN(cospi)
 
 extern float __attribute__((overloadable)) erfc(float);
@@ -162,7 +162,7 @@ FN_FUNC_FN(exp2)
 
 extern float __attribute__((overloadable)) pow(float, float);
 
-_RS_STATIC float __attribute__((overloadable)) exp10(float v);
+_RS_RUNTIME float __attribute__((overloadable)) exp10(float v);
 FN_FUNC_FN(exp10)
 
 extern float __attribute__((overloadable)) expm1(float);
@@ -192,7 +192,7 @@ extern float __attribute__((overloadable)) fmod(float, float);
 FN_FUNC_FN_FN(fmod)
 
 
-_RS_STATIC float __attribute__((overloadable)) fract(float v, float *iptr);
+_RS_RUNTIME float __attribute__((overloadable)) fract(float v, float *iptr);
 FN_FUNC_FN_PFN(fract)
 
 extern float __attribute__((overloadable)) frexp(float, int *);
@@ -221,7 +221,7 @@ extern float __attribute__((overloadable)) log10(float);
 FN_FUNC_FN(log10)
 
 
-_RS_STATIC float __attribute__((overloadable)) log2(float v);
+_RS_RUNTIME float __attribute__((overloadable)) log2(float v);
 FN_FUNC_FN(log2)
 
 extern float __attribute__((overloadable)) log1p(float);
@@ -243,15 +243,15 @@ FN_FUNC_FN_FN(nextafter)
 
 FN_FUNC_FN_FN(pow)
 
-_RS_STATIC float __attribute__((overloadable)) pown(float v, int p);
-_RS_STATIC float2 __attribute__((overloadable)) pown(float2 v, int2 p);
-_RS_STATIC float3 __attribute__((overloadable)) pown(float3 v, int3 p);
-_RS_STATIC float4 __attribute__((overloadable)) pown(float4 v, int4 p);
+_RS_RUNTIME float __attribute__((overloadable)) pown(float v, int p);
+_RS_RUNTIME float2 __attribute__((overloadable)) pown(float2 v, int2 p);
+_RS_RUNTIME float3 __attribute__((overloadable)) pown(float3 v, int3 p);
+_RS_RUNTIME float4 __attribute__((overloadable)) pown(float4 v, int4 p);
 
-_RS_STATIC float __attribute__((overloadable)) powr(float v, float p);
-_RS_STATIC float2 __attribute__((overloadable)) powr(float2 v, float2 p);
-_RS_STATIC float3 __attribute__((overloadable)) powr(float3 v, float3 p);
-_RS_STATIC float4 __attribute__((overloadable)) powr(float4 v, float4 p);
+_RS_RUNTIME float __attribute__((overloadable)) powr(float v, float p);
+_RS_RUNTIME float2 __attribute__((overloadable)) powr(float2 v, float2 p);
+_RS_RUNTIME float3 __attribute__((overloadable)) powr(float3 v, float3 p);
+_RS_RUNTIME float4 __attribute__((overloadable)) powr(float4 v, float4 p);
 
 extern float __attribute__((overloadable)) remainder(float, float);
 FN_FUNC_FN_FN(remainder)
@@ -263,10 +263,10 @@ extern float __attribute__((overloadable)) rint(float);
 FN_FUNC_FN(rint)
 
 
-_RS_STATIC float __attribute__((overloadable)) rootn(float v, int r);
-_RS_STATIC float2 __attribute__((overloadable)) rootn(float2 v, int2 r);
-_RS_STATIC float3 __attribute__((overloadable)) rootn(float3 v, int3 r);
-_RS_STATIC float4 __attribute__((overloadable)) rootn(float4 v, int4 r);
+_RS_RUNTIME float __attribute__((overloadable)) rootn(float v, int r);
+_RS_RUNTIME float2 __attribute__((overloadable)) rootn(float2 v, int2 r);
+_RS_RUNTIME float3 __attribute__((overloadable)) rootn(float3 v, int3 r);
+_RS_RUNTIME float4 __attribute__((overloadable)) rootn(float4 v, int4 r);
 
 
 extern float __attribute__((overloadable)) round(float);
@@ -274,21 +274,21 @@ FN_FUNC_FN(round)
 
 
 extern float __attribute__((overloadable)) sqrt(float);
-_RS_STATIC float __attribute__((overloadable)) rsqrt(float v);
+_RS_RUNTIME float __attribute__((overloadable)) rsqrt(float v);
 FN_FUNC_FN(rsqrt)
 
 extern float __attribute__((overloadable)) sin(float);
 FN_FUNC_FN(sin)
 
-_RS_STATIC float __attribute__((overloadable)) sincos(float v, float *cosptr);
-_RS_STATIC float2 __attribute__((overloadable)) sincos(float2 v, float2 *cosptr);
-_RS_STATIC float3 __attribute__((overloadable)) sincos(float3 v, float3 *cosptr);
-_RS_STATIC float4 __attribute__((overloadable)) sincos(float4 v, float4 *cosptr);
+_RS_RUNTIME float __attribute__((overloadable)) sincos(float v, float *cosptr);
+_RS_RUNTIME float2 __attribute__((overloadable)) sincos(float2 v, float2 *cosptr);
+_RS_RUNTIME float3 __attribute__((overloadable)) sincos(float3 v, float3 *cosptr);
+_RS_RUNTIME float4 __attribute__((overloadable)) sincos(float4 v, float4 *cosptr);
 
 extern float __attribute__((overloadable)) sinh(float);
 FN_FUNC_FN(sinh)
 
-_RS_STATIC float __attribute__((overloadable)) sinpi(float v);
+_RS_RUNTIME float __attribute__((overloadable)) sinpi(float v);
 FN_FUNC_FN(sinpi)
 
 FN_FUNC_FN(sqrt)
@@ -299,7 +299,7 @@ FN_FUNC_FN(tan)
 extern float __attribute__((overloadable)) tanh(float);
 FN_FUNC_FN(tanh)
 
-_RS_STATIC float __attribute__((overloadable)) tanpi(float v);
+_RS_RUNTIME float __attribute__((overloadable)) tanpi(float v);
 FN_FUNC_FN(tanpi)
 
 
@@ -313,9 +313,9 @@ FN_FUNC_FN(trunc)
 
 #define XN_FUNC_YN(typeout, fnc, typein)                                \
 extern typeout __attribute__((overloadable)) fnc(typein);               \
-_RS_STATIC typeout##2 __attribute__((overloadable)) fnc(typein##2 v);   \
-_RS_STATIC typeout##3 __attribute__((overloadable)) fnc(typein##3 v);   \
-_RS_STATIC typeout##4 __attribute__((overloadable)) fnc(typein##4 v);
+_RS_RUNTIME typeout##2 __attribute__((overloadable)) fnc(typein##2 v);   \
+_RS_RUNTIME typeout##3 __attribute__((overloadable)) fnc(typein##3 v);   \
+_RS_RUNTIME typeout##4 __attribute__((overloadable)) fnc(typein##4 v);
 
 #define UIN_FUNC_IN(fnc)          \
 XN_FUNC_YN(uchar, fnc, char)      \
@@ -332,13 +332,13 @@ XN_FUNC_YN(int, fnc, int)
 
 
 #define XN_FUNC_XN_XN_BODY(type, fnc, body)         \
-_RS_STATIC type __attribute__((overloadable))       \
+_RS_RUNTIME type __attribute__((overloadable))       \
         fnc(type v1, type v2);                      \
-_RS_STATIC type##2 __attribute__((overloadable))    \
+_RS_RUNTIME type##2 __attribute__((overloadable))    \
         fnc(type##2 v1, type##2 v2);                \
-_RS_STATIC type##3 __attribute__((overloadable))    \
+_RS_RUNTIME type##3 __attribute__((overloadable))    \
         fnc(type##3 v1, type##3 v2);                \
-_RS_STATIC type##4 __attribute__((overloadable))    \
+_RS_RUNTIME type##4 __attribute__((overloadable))    \
         fnc(type##4 v1, type##4 v2);
 
 #define IN_FUNC_IN_IN_BODY(fnc, body) \
@@ -361,35 +361,35 @@ FN_FUNC_FN_F(max)
 
 // 6.11.4
 
-_RS_STATIC float __attribute__((overloadable)) clamp(float amount, float low, float high);
-_RS_STATIC float2 __attribute__((overloadable)) clamp(float2 amount, float2 low, float2 high);
-_RS_STATIC float3 __attribute__((overloadable)) clamp(float3 amount, float3 low, float3 high);
-_RS_STATIC float4 __attribute__((overloadable)) clamp(float4 amount, float4 low, float4 high);
-_RS_STATIC float2 __attribute__((overloadable)) clamp(float2 amount, float low, float high);
-_RS_STATIC float3 __attribute__((overloadable)) clamp(float3 amount, float low, float high);
-_RS_STATIC float4 __attribute__((overloadable)) clamp(float4 amount, float low, float high);
+_RS_RUNTIME float __attribute__((overloadable)) clamp(float amount, float low, float high);
+_RS_RUNTIME float2 __attribute__((overloadable)) clamp(float2 amount, float2 low, float2 high);
+_RS_RUNTIME float3 __attribute__((overloadable)) clamp(float3 amount, float3 low, float3 high);
+_RS_RUNTIME float4 __attribute__((overloadable)) clamp(float4 amount, float4 low, float4 high);
+_RS_RUNTIME float2 __attribute__((overloadable)) clamp(float2 amount, float low, float high);
+_RS_RUNTIME float3 __attribute__((overloadable)) clamp(float3 amount, float low, float high);
+_RS_RUNTIME float4 __attribute__((overloadable)) clamp(float4 amount, float low, float high);
 
-_RS_STATIC float __attribute__((overloadable)) degrees(float radians);
+_RS_RUNTIME float __attribute__((overloadable)) degrees(float radians);
 FN_FUNC_FN(degrees)
 
-_RS_STATIC float __attribute__((overloadable)) mix(float start, float stop, float amount);
-_RS_STATIC float2 __attribute__((overloadable)) mix(float2 start, float2 stop, float2 amount);
-_RS_STATIC float3 __attribute__((overloadable)) mix(float3 start, float3 stop, float3 amount);
-_RS_STATIC float4 __attribute__((overloadable)) mix(float4 start, float4 stop, float4 amount);
-_RS_STATIC float2 __attribute__((overloadable)) mix(float2 start, float2 stop, float amount);
-_RS_STATIC float3 __attribute__((overloadable)) mix(float3 start, float3 stop, float amount);
-_RS_STATIC float4 __attribute__((overloadable)) mix(float4 start, float4 stop, float amount);
+_RS_RUNTIME float __attribute__((overloadable)) mix(float start, float stop, float amount);
+_RS_RUNTIME float2 __attribute__((overloadable)) mix(float2 start, float2 stop, float2 amount);
+_RS_RUNTIME float3 __attribute__((overloadable)) mix(float3 start, float3 stop, float3 amount);
+_RS_RUNTIME float4 __attribute__((overloadable)) mix(float4 start, float4 stop, float4 amount);
+_RS_RUNTIME float2 __attribute__((overloadable)) mix(float2 start, float2 stop, float amount);
+_RS_RUNTIME float3 __attribute__((overloadable)) mix(float3 start, float3 stop, float amount);
+_RS_RUNTIME float4 __attribute__((overloadable)) mix(float4 start, float4 stop, float amount);
 
-_RS_STATIC float __attribute__((overloadable)) radians(float degrees);
+_RS_RUNTIME float __attribute__((overloadable)) radians(float degrees);
 FN_FUNC_FN(radians)
 
-_RS_STATIC float __attribute__((overloadable)) step(float edge, float v);
-_RS_STATIC float2 __attribute__((overloadable)) step(float2 edge, float2 v);
-_RS_STATIC float3 __attribute__((overloadable)) step(float3 edge, float3 v);
-_RS_STATIC float4 __attribute__((overloadable)) step(float4 edge, float4 v);
-_RS_STATIC float2 __attribute__((overloadable)) step(float2 edge, float v);
-_RS_STATIC float3 __attribute__((overloadable)) step(float3 edge, float v);
-_RS_STATIC float4 __attribute__((overloadable)) step(float4 edge, float v);
+_RS_RUNTIME float __attribute__((overloadable)) step(float edge, float v);
+_RS_RUNTIME float2 __attribute__((overloadable)) step(float2 edge, float2 v);
+_RS_RUNTIME float3 __attribute__((overloadable)) step(float3 edge, float3 v);
+_RS_RUNTIME float4 __attribute__((overloadable)) step(float4 edge, float4 v);
+_RS_RUNTIME float2 __attribute__((overloadable)) step(float2 edge, float v);
+_RS_RUNTIME float3 __attribute__((overloadable)) step(float3 edge, float v);
+_RS_RUNTIME float4 __attribute__((overloadable)) step(float4 edge, float v);
 
 extern float __attribute__((overloadable)) smoothstep(float, float, float);
 extern float2 __attribute__((overloadable)) smoothstep(float2, float2, float2);
@@ -399,33 +399,33 @@ extern float2 __attribute__((overloadable)) smoothstep(float, float, float2);
 extern float3 __attribute__((overloadable)) smoothstep(float, float, float3);
 extern float4 __attribute__((overloadable)) smoothstep(float, float, float4);
 
-_RS_STATIC float __attribute__((overloadable)) sign(float v);
+_RS_RUNTIME float __attribute__((overloadable)) sign(float v);
 FN_FUNC_FN(sign)
 
 // 6.11.5
-_RS_STATIC float3 __attribute__((overloadable)) cross(float3 lhs, float3 rhs);
+_RS_RUNTIME float3 __attribute__((overloadable)) cross(float3 lhs, float3 rhs);
 
-_RS_STATIC float4 __attribute__((overloadable)) cross(float4 lhs, float4 rhs);
+_RS_RUNTIME float4 __attribute__((overloadable)) cross(float4 lhs, float4 rhs);
 
-_RS_STATIC float __attribute__((overloadable)) dot(float lhs, float rhs);
-_RS_STATIC float __attribute__((overloadable)) dot(float2 lhs, float2 rhs);
-_RS_STATIC float __attribute__((overloadable)) dot(float3 lhs, float3 rhs);
-_RS_STATIC float __attribute__((overloadable)) dot(float4 lhs, float4 rhs);
+_RS_RUNTIME float __attribute__((overloadable)) dot(float lhs, float rhs);
+_RS_RUNTIME float __attribute__((overloadable)) dot(float2 lhs, float2 rhs);
+_RS_RUNTIME float __attribute__((overloadable)) dot(float3 lhs, float3 rhs);
+_RS_RUNTIME float __attribute__((overloadable)) dot(float4 lhs, float4 rhs);
 
-_RS_STATIC float __attribute__((overloadable)) length(float v);
-_RS_STATIC float __attribute__((overloadable)) length(float2 v);
-_RS_STATIC float __attribute__((overloadable)) length(float3 v);
-_RS_STATIC float __attribute__((overloadable)) length(float4 v);
+_RS_RUNTIME float __attribute__((overloadable)) length(float v);
+_RS_RUNTIME float __attribute__((overloadable)) length(float2 v);
+_RS_RUNTIME float __attribute__((overloadable)) length(float3 v);
+_RS_RUNTIME float __attribute__((overloadable)) length(float4 v);
 
-_RS_STATIC float __attribute__((overloadable)) distance(float lhs, float rhs);
-_RS_STATIC float __attribute__((overloadable)) distance(float2 lhs, float2 rhs);
-_RS_STATIC float __attribute__((overloadable)) distance(float3 lhs, float3 rhs);
-_RS_STATIC float __attribute__((overloadable)) distance(float4 lhs, float4 rhs);
+_RS_RUNTIME float __attribute__((overloadable)) distance(float lhs, float rhs);
+_RS_RUNTIME float __attribute__((overloadable)) distance(float2 lhs, float2 rhs);
+_RS_RUNTIME float __attribute__((overloadable)) distance(float3 lhs, float3 rhs);
+_RS_RUNTIME float __attribute__((overloadable)) distance(float4 lhs, float4 rhs);
 
-_RS_STATIC float __attribute__((overloadable)) normalize(float v);
-_RS_STATIC float2 __attribute__((overloadable)) normalize(float2 v);
-_RS_STATIC float3 __attribute__((overloadable)) normalize(float3 v);
-_RS_STATIC float4 __attribute__((overloadable)) normalize(float4 v);
+_RS_RUNTIME float __attribute__((overloadable)) normalize(float v);
+_RS_RUNTIME float2 __attribute__((overloadable)) normalize(float2 v);
+_RS_RUNTIME float3 __attribute__((overloadable)) normalize(float3 v);
+_RS_RUNTIME float4 __attribute__((overloadable)) normalize(float4 v);
 
 #undef CVT_FUNC
 #undef CVT_FUNC_2
@@ -444,6 +444,6 @@ _RS_STATIC float4 __attribute__((overloadable)) normalize(float4 v);
 #undef IN_FUNC_IN
 #undef XN_FUNC_XN_XN_BODY
 #undef IN_FUNC_IN_IN_BODY
-#undef _RS_STATIC
+#undef _RS_RUNTIME
 
 #endif