diff options
Diffstat (limited to 'renderscript/include')
| -rw-r--r-- | renderscript/include/rs_core.rsh | 2 | ||||
| -rw-r--r-- | renderscript/include/rs_core_math.rsh | 603 | ||||
| -rw-r--r-- | renderscript/include/rs_graphics.rsh | 5 | ||||
| -rw-r--r-- | renderscript/include/rs_object.rsh | 11 | ||||
| -rw-r--r-- | renderscript/include/rs_types.rsh | 23 |
5 files changed, 215 insertions, 429 deletions
diff --git a/renderscript/include/rs_core.rsh b/renderscript/include/rs_core.rsh index 0d3642e..3489e44 100644 --- a/renderscript/include/rs_core.rsh +++ b/renderscript/include/rs_core.rsh @@ -48,6 +48,8 @@ #define _RS_RUNTIME extern +#define RS_KERNEL __attribute__((kernel)) + #include "rs_types.rsh" #include "rs_allocation.rsh" #include "rs_atomic.rsh" diff --git a/renderscript/include/rs_core_math.rsh b/renderscript/include/rs_core_math.rsh index b6058ee..585b91a 100644 --- a/renderscript/include/rs_core_math.rsh +++ b/renderscript/include/rs_core_math.rsh @@ -2954,812 +2954,812 @@ extern uint4 __attribute__((const, overloadable))convert_uint4(uint4 v); #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from double2 to float2 + * Component wise conversion from double2 to double2 * * Supported by API versions 21 and newer. */ -extern float2 __attribute__((const, overloadable))convert_float2(double2 v); +extern double2 __attribute__((const, overloadable))convert_double2(double2 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from double3 to float3 + * Component wise conversion from double3 to double3 * * Supported by API versions 21 and newer. */ -extern float3 __attribute__((const, overloadable))convert_float3(double3 v); +extern double3 __attribute__((const, overloadable))convert_double3(double3 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from double4 to float4 + * Component wise conversion from double4 to double4 * * Supported by API versions 21 and newer. */ -extern float4 __attribute__((const, overloadable))convert_float4(double4 v); +extern double4 __attribute__((const, overloadable))convert_double4(double4 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from long2 to float2 + * Component wise conversion from long2 to double2 * * Supported by API versions 21 and newer. */ -extern float2 __attribute__((const, overloadable))convert_float2(long2 v); +extern double2 __attribute__((const, overloadable))convert_double2(long2 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from long3 to float3 + * Component wise conversion from long3 to double3 * * Supported by API versions 21 and newer. */ -extern float3 __attribute__((const, overloadable))convert_float3(long3 v); +extern double3 __attribute__((const, overloadable))convert_double3(long3 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from long4 to float4 + * Component wise conversion from long4 to double4 * * Supported by API versions 21 and newer. */ -extern float4 __attribute__((const, overloadable))convert_float4(long4 v); +extern double4 __attribute__((const, overloadable))convert_double4(long4 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from ulong2 to float2 + * Component wise conversion from ulong2 to double2 * * Supported by API versions 21 and newer. */ -extern float2 __attribute__((const, overloadable))convert_float2(ulong2 v); +extern double2 __attribute__((const, overloadable))convert_double2(ulong2 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from ulong3 to float3 + * Component wise conversion from ulong3 to double3 * * Supported by API versions 21 and newer. */ -extern float3 __attribute__((const, overloadable))convert_float3(ulong3 v); +extern double3 __attribute__((const, overloadable))convert_double3(ulong3 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from ulong4 to float4 + * Component wise conversion from ulong4 to double4 * * Supported by API versions 21 and newer. */ -extern float4 __attribute__((const, overloadable))convert_float4(ulong4 v); +extern double4 __attribute__((const, overloadable))convert_double4(ulong4 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from double2 to double2 + * Component wise conversion from double2 to long2 * * Supported by API versions 21 and newer. */ -extern double2 __attribute__((const, overloadable))convert_double2(double2 v); +extern long2 __attribute__((const, overloadable))convert_long2(double2 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from double3 to double3 + * Component wise conversion from double3 to long3 * * Supported by API versions 21 and newer. */ -extern double3 __attribute__((const, overloadable))convert_double3(double3 v); +extern long3 __attribute__((const, overloadable))convert_long3(double3 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from double4 to double4 + * Component wise conversion from double4 to long4 * * Supported by API versions 21 and newer. */ -extern double4 __attribute__((const, overloadable))convert_double4(double4 v); +extern long4 __attribute__((const, overloadable))convert_long4(double4 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from long2 to double2 + * Component wise conversion from long2 to long2 * * Supported by API versions 21 and newer. */ -extern double2 __attribute__((const, overloadable))convert_double2(long2 v); +extern long2 __attribute__((const, overloadable))convert_long2(long2 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from long3 to double3 + * Component wise conversion from long3 to long3 * * Supported by API versions 21 and newer. */ -extern double3 __attribute__((const, overloadable))convert_double3(long3 v); +extern long3 __attribute__((const, overloadable))convert_long3(long3 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from long4 to double4 + * Component wise conversion from long4 to long4 * * Supported by API versions 21 and newer. */ -extern double4 __attribute__((const, overloadable))convert_double4(long4 v); +extern long4 __attribute__((const, overloadable))convert_long4(long4 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from ulong2 to double2 + * Component wise conversion from ulong2 to long2 * * Supported by API versions 21 and newer. */ -extern double2 __attribute__((const, overloadable))convert_double2(ulong2 v); +extern long2 __attribute__((const, overloadable))convert_long2(ulong2 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from ulong3 to double3 + * Component wise conversion from ulong3 to long3 * * Supported by API versions 21 and newer. */ -extern double3 __attribute__((const, overloadable))convert_double3(ulong3 v); +extern long3 __attribute__((const, overloadable))convert_long3(ulong3 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from ulong4 to double4 + * Component wise conversion from ulong4 to long4 * * Supported by API versions 21 and newer. */ -extern double4 __attribute__((const, overloadable))convert_double4(ulong4 v); +extern long4 __attribute__((const, overloadable))convert_long4(ulong4 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from double2 to char2 + * Component wise conversion from double2 to ulong2 * * Supported by API versions 21 and newer. */ -extern char2 __attribute__((const, overloadable))convert_char2(double2 v); +extern ulong2 __attribute__((const, overloadable))convert_ulong2(double2 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from double3 to char3 + * Component wise conversion from double3 to ulong3 * * Supported by API versions 21 and newer. */ -extern char3 __attribute__((const, overloadable))convert_char3(double3 v); +extern ulong3 __attribute__((const, overloadable))convert_ulong3(double3 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from double4 to char4 + * Component wise conversion from double4 to ulong4 * * Supported by API versions 21 and newer. */ -extern char4 __attribute__((const, overloadable))convert_char4(double4 v); +extern ulong4 __attribute__((const, overloadable))convert_ulong4(double4 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from long2 to char2 + * Component wise conversion from long2 to ulong2 * * Supported by API versions 21 and newer. */ -extern char2 __attribute__((const, overloadable))convert_char2(long2 v); +extern ulong2 __attribute__((const, overloadable))convert_ulong2(long2 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from long3 to char3 + * Component wise conversion from long3 to ulong3 * * Supported by API versions 21 and newer. */ -extern char3 __attribute__((const, overloadable))convert_char3(long3 v); +extern ulong3 __attribute__((const, overloadable))convert_ulong3(long3 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from long4 to char4 + * Component wise conversion from long4 to ulong4 * * Supported by API versions 21 and newer. */ -extern char4 __attribute__((const, overloadable))convert_char4(long4 v); +extern ulong4 __attribute__((const, overloadable))convert_ulong4(long4 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from ulong2 to char2 + * Component wise conversion from ulong2 to ulong2 * * Supported by API versions 21 and newer. */ -extern char2 __attribute__((const, overloadable))convert_char2(ulong2 v); +extern ulong2 __attribute__((const, overloadable))convert_ulong2(ulong2 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from ulong3 to char3 + * Component wise conversion from ulong3 to ulong3 * * Supported by API versions 21 and newer. */ -extern char3 __attribute__((const, overloadable))convert_char3(ulong3 v); +extern ulong3 __attribute__((const, overloadable))convert_ulong3(ulong3 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from ulong4 to char4 + * Component wise conversion from ulong4 to ulong4 * * Supported by API versions 21 and newer. */ -extern char4 __attribute__((const, overloadable))convert_char4(ulong4 v); +extern ulong4 __attribute__((const, overloadable))convert_ulong4(ulong4 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from double2 to uchar2 + * Component wise conversion from double2 to float2 * * Supported by API versions 21 and newer. */ -extern uchar2 __attribute__((const, overloadable))convert_uchar2(double2 v); +extern float2 __attribute__((const, overloadable))convert_float2(double2 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from double3 to uchar3 + * Component wise conversion from double3 to float3 * * Supported by API versions 21 and newer. */ -extern uchar3 __attribute__((const, overloadable))convert_uchar3(double3 v); +extern float3 __attribute__((const, overloadable))convert_float3(double3 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from double4 to uchar4 + * Component wise conversion from double4 to float4 * * Supported by API versions 21 and newer. */ -extern uchar4 __attribute__((const, overloadable))convert_uchar4(double4 v); +extern float4 __attribute__((const, overloadable))convert_float4(double4 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from long2 to uchar2 + * Component wise conversion from long2 to float2 * * Supported by API versions 21 and newer. */ -extern uchar2 __attribute__((const, overloadable))convert_uchar2(long2 v); +extern float2 __attribute__((const, overloadable))convert_float2(long2 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from long3 to uchar3 + * Component wise conversion from long3 to float3 * * Supported by API versions 21 and newer. */ -extern uchar3 __attribute__((const, overloadable))convert_uchar3(long3 v); +extern float3 __attribute__((const, overloadable))convert_float3(long3 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from long4 to uchar4 + * Component wise conversion from long4 to float4 * * Supported by API versions 21 and newer. */ -extern uchar4 __attribute__((const, overloadable))convert_uchar4(long4 v); +extern float4 __attribute__((const, overloadable))convert_float4(long4 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from ulong2 to uchar2 + * Component wise conversion from ulong2 to float2 * * Supported by API versions 21 and newer. */ -extern uchar2 __attribute__((const, overloadable))convert_uchar2(ulong2 v); +extern float2 __attribute__((const, overloadable))convert_float2(ulong2 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from ulong3 to uchar3 + * Component wise conversion from ulong3 to float3 * * Supported by API versions 21 and newer. */ -extern uchar3 __attribute__((const, overloadable))convert_uchar3(ulong3 v); +extern float3 __attribute__((const, overloadable))convert_float3(ulong3 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from ulong4 to uchar4 + * Component wise conversion from ulong4 to float4 * * Supported by API versions 21 and newer. */ -extern uchar4 __attribute__((const, overloadable))convert_uchar4(ulong4 v); +extern float4 __attribute__((const, overloadable))convert_float4(ulong4 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from double2 to short2 + * Component wise conversion from double2 to char2 * * Supported by API versions 21 and newer. */ -extern short2 __attribute__((const, overloadable))convert_short2(double2 v); +extern char2 __attribute__((const, overloadable))convert_char2(double2 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from double3 to short3 + * Component wise conversion from double3 to char3 * * Supported by API versions 21 and newer. */ -extern short3 __attribute__((const, overloadable))convert_short3(double3 v); +extern char3 __attribute__((const, overloadable))convert_char3(double3 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from double4 to short4 + * Component wise conversion from double4 to char4 * * Supported by API versions 21 and newer. */ -extern short4 __attribute__((const, overloadable))convert_short4(double4 v); +extern char4 __attribute__((const, overloadable))convert_char4(double4 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from long2 to short2 + * Component wise conversion from long2 to char2 * * Supported by API versions 21 and newer. */ -extern short2 __attribute__((const, overloadable))convert_short2(long2 v); +extern char2 __attribute__((const, overloadable))convert_char2(long2 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from long3 to short3 + * Component wise conversion from long3 to char3 * * Supported by API versions 21 and newer. */ -extern short3 __attribute__((const, overloadable))convert_short3(long3 v); +extern char3 __attribute__((const, overloadable))convert_char3(long3 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from long4 to short4 + * Component wise conversion from long4 to char4 * * Supported by API versions 21 and newer. */ -extern short4 __attribute__((const, overloadable))convert_short4(long4 v); +extern char4 __attribute__((const, overloadable))convert_char4(long4 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from ulong2 to short2 + * Component wise conversion from ulong2 to char2 * * Supported by API versions 21 and newer. */ -extern short2 __attribute__((const, overloadable))convert_short2(ulong2 v); +extern char2 __attribute__((const, overloadable))convert_char2(ulong2 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from ulong3 to short3 + * Component wise conversion from ulong3 to char3 * * Supported by API versions 21 and newer. */ -extern short3 __attribute__((const, overloadable))convert_short3(ulong3 v); +extern char3 __attribute__((const, overloadable))convert_char3(ulong3 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from ulong4 to short4 + * Component wise conversion from ulong4 to char4 * * Supported by API versions 21 and newer. */ -extern short4 __attribute__((const, overloadable))convert_short4(ulong4 v); +extern char4 __attribute__((const, overloadable))convert_char4(ulong4 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from double2 to ushort2 + * Component wise conversion from double2 to uchar2 * * Supported by API versions 21 and newer. */ -extern ushort2 __attribute__((const, overloadable))convert_ushort2(double2 v); +extern uchar2 __attribute__((const, overloadable))convert_uchar2(double2 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from double3 to ushort3 + * Component wise conversion from double3 to uchar3 * * Supported by API versions 21 and newer. */ -extern ushort3 __attribute__((const, overloadable))convert_ushort3(double3 v); +extern uchar3 __attribute__((const, overloadable))convert_uchar3(double3 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from double4 to ushort4 + * Component wise conversion from double4 to uchar4 * * Supported by API versions 21 and newer. */ -extern ushort4 __attribute__((const, overloadable))convert_ushort4(double4 v); +extern uchar4 __attribute__((const, overloadable))convert_uchar4(double4 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from long2 to ushort2 + * Component wise conversion from long2 to uchar2 * * Supported by API versions 21 and newer. */ -extern ushort2 __attribute__((const, overloadable))convert_ushort2(long2 v); +extern uchar2 __attribute__((const, overloadable))convert_uchar2(long2 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from long3 to ushort3 + * Component wise conversion from long3 to uchar3 * * Supported by API versions 21 and newer. */ -extern ushort3 __attribute__((const, overloadable))convert_ushort3(long3 v); +extern uchar3 __attribute__((const, overloadable))convert_uchar3(long3 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from long4 to ushort4 + * Component wise conversion from long4 to uchar4 * * Supported by API versions 21 and newer. */ -extern ushort4 __attribute__((const, overloadable))convert_ushort4(long4 v); +extern uchar4 __attribute__((const, overloadable))convert_uchar4(long4 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from ulong2 to ushort2 + * Component wise conversion from ulong2 to uchar2 * * Supported by API versions 21 and newer. */ -extern ushort2 __attribute__((const, overloadable))convert_ushort2(ulong2 v); +extern uchar2 __attribute__((const, overloadable))convert_uchar2(ulong2 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from ulong3 to ushort3 + * Component wise conversion from ulong3 to uchar3 * * Supported by API versions 21 and newer. */ -extern ushort3 __attribute__((const, overloadable))convert_ushort3(ulong3 v); +extern uchar3 __attribute__((const, overloadable))convert_uchar3(ulong3 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from ulong4 to ushort4 + * Component wise conversion from ulong4 to uchar4 * * Supported by API versions 21 and newer. */ -extern ushort4 __attribute__((const, overloadable))convert_ushort4(ulong4 v); +extern uchar4 __attribute__((const, overloadable))convert_uchar4(ulong4 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from double2 to int2 + * Component wise conversion from double2 to short2 * * Supported by API versions 21 and newer. */ -extern int2 __attribute__((const, overloadable))convert_int2(double2 v); +extern short2 __attribute__((const, overloadable))convert_short2(double2 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from double3 to int3 + * Component wise conversion from double3 to short3 * * Supported by API versions 21 and newer. */ -extern int3 __attribute__((const, overloadable))convert_int3(double3 v); +extern short3 __attribute__((const, overloadable))convert_short3(double3 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from double4 to int4 + * Component wise conversion from double4 to short4 * * Supported by API versions 21 and newer. */ -extern int4 __attribute__((const, overloadable))convert_int4(double4 v); +extern short4 __attribute__((const, overloadable))convert_short4(double4 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from long2 to int2 + * Component wise conversion from long2 to short2 * * Supported by API versions 21 and newer. */ -extern int2 __attribute__((const, overloadable))convert_int2(long2 v); +extern short2 __attribute__((const, overloadable))convert_short2(long2 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from long3 to int3 + * Component wise conversion from long3 to short3 * * Supported by API versions 21 and newer. */ -extern int3 __attribute__((const, overloadable))convert_int3(long3 v); +extern short3 __attribute__((const, overloadable))convert_short3(long3 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from long4 to int4 + * Component wise conversion from long4 to short4 * * Supported by API versions 21 and newer. */ -extern int4 __attribute__((const, overloadable))convert_int4(long4 v); +extern short4 __attribute__((const, overloadable))convert_short4(long4 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from ulong2 to int2 + * Component wise conversion from ulong2 to short2 * * Supported by API versions 21 and newer. */ -extern int2 __attribute__((const, overloadable))convert_int2(ulong2 v); +extern short2 __attribute__((const, overloadable))convert_short2(ulong2 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from ulong3 to int3 + * Component wise conversion from ulong3 to short3 * * Supported by API versions 21 and newer. */ -extern int3 __attribute__((const, overloadable))convert_int3(ulong3 v); +extern short3 __attribute__((const, overloadable))convert_short3(ulong3 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from ulong4 to int4 + * Component wise conversion from ulong4 to short4 * * Supported by API versions 21 and newer. */ -extern int4 __attribute__((const, overloadable))convert_int4(ulong4 v); +extern short4 __attribute__((const, overloadable))convert_short4(ulong4 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from double2 to uint2 + * Component wise conversion from double2 to ushort2 * * Supported by API versions 21 and newer. */ -extern uint2 __attribute__((const, overloadable))convert_uint2(double2 v); +extern ushort2 __attribute__((const, overloadable))convert_ushort2(double2 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from double3 to uint3 + * Component wise conversion from double3 to ushort3 * * Supported by API versions 21 and newer. */ -extern uint3 __attribute__((const, overloadable))convert_uint3(double3 v); +extern ushort3 __attribute__((const, overloadable))convert_ushort3(double3 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from double4 to uint4 + * Component wise conversion from double4 to ushort4 * * Supported by API versions 21 and newer. */ -extern uint4 __attribute__((const, overloadable))convert_uint4(double4 v); +extern ushort4 __attribute__((const, overloadable))convert_ushort4(double4 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from long2 to uint2 + * Component wise conversion from long2 to ushort2 * * Supported by API versions 21 and newer. */ -extern uint2 __attribute__((const, overloadable))convert_uint2(long2 v); +extern ushort2 __attribute__((const, overloadable))convert_ushort2(long2 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from long3 to uint3 + * Component wise conversion from long3 to ushort3 * * Supported by API versions 21 and newer. */ -extern uint3 __attribute__((const, overloadable))convert_uint3(long3 v); +extern ushort3 __attribute__((const, overloadable))convert_ushort3(long3 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from long4 to uint4 + * Component wise conversion from long4 to ushort4 * * Supported by API versions 21 and newer. */ -extern uint4 __attribute__((const, overloadable))convert_uint4(long4 v); +extern ushort4 __attribute__((const, overloadable))convert_ushort4(long4 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from ulong2 to uint2 + * Component wise conversion from ulong2 to ushort2 * * Supported by API versions 21 and newer. */ -extern uint2 __attribute__((const, overloadable))convert_uint2(ulong2 v); +extern ushort2 __attribute__((const, overloadable))convert_ushort2(ulong2 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from ulong3 to uint3 + * Component wise conversion from ulong3 to ushort3 * * Supported by API versions 21 and newer. */ -extern uint3 __attribute__((const, overloadable))convert_uint3(ulong3 v); +extern ushort3 __attribute__((const, overloadable))convert_ushort3(ulong3 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from ulong4 to uint4 + * Component wise conversion from ulong4 to ushort4 * * Supported by API versions 21 and newer. */ -extern uint4 __attribute__((const, overloadable))convert_uint4(ulong4 v); +extern ushort4 __attribute__((const, overloadable))convert_ushort4(ulong4 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from double2 to long2 + * Component wise conversion from double2 to int2 * * Supported by API versions 21 and newer. */ -extern long2 __attribute__((const, overloadable))convert_long2(double2 v); +extern int2 __attribute__((const, overloadable))convert_int2(double2 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from double3 to long3 + * Component wise conversion from double3 to int3 * * Supported by API versions 21 and newer. */ -extern long3 __attribute__((const, overloadable))convert_long3(double3 v); +extern int3 __attribute__((const, overloadable))convert_int3(double3 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from double4 to long4 + * Component wise conversion from double4 to int4 * * Supported by API versions 21 and newer. */ -extern long4 __attribute__((const, overloadable))convert_long4(double4 v); +extern int4 __attribute__((const, overloadable))convert_int4(double4 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from long2 to long2 + * Component wise conversion from long2 to int2 * * Supported by API versions 21 and newer. */ -extern long2 __attribute__((const, overloadable))convert_long2(long2 v); +extern int2 __attribute__((const, overloadable))convert_int2(long2 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from long3 to long3 + * Component wise conversion from long3 to int3 * * Supported by API versions 21 and newer. */ -extern long3 __attribute__((const, overloadable))convert_long3(long3 v); +extern int3 __attribute__((const, overloadable))convert_int3(long3 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from long4 to long4 + * Component wise conversion from long4 to int4 * * Supported by API versions 21 and newer. */ -extern long4 __attribute__((const, overloadable))convert_long4(long4 v); +extern int4 __attribute__((const, overloadable))convert_int4(long4 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from ulong2 to long2 + * Component wise conversion from ulong2 to int2 * * Supported by API versions 21 and newer. */ -extern long2 __attribute__((const, overloadable))convert_long2(ulong2 v); +extern int2 __attribute__((const, overloadable))convert_int2(ulong2 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from ulong3 to long3 + * Component wise conversion from ulong3 to int3 * * Supported by API versions 21 and newer. */ -extern long3 __attribute__((const, overloadable))convert_long3(ulong3 v); +extern int3 __attribute__((const, overloadable))convert_int3(ulong3 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from ulong4 to long4 + * Component wise conversion from ulong4 to int4 * * Supported by API versions 21 and newer. */ -extern long4 __attribute__((const, overloadable))convert_long4(ulong4 v); +extern int4 __attribute__((const, overloadable))convert_int4(ulong4 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from double2 to ulong2 + * Component wise conversion from double2 to uint2 * * Supported by API versions 21 and newer. */ -extern ulong2 __attribute__((const, overloadable))convert_ulong2(double2 v); +extern uint2 __attribute__((const, overloadable))convert_uint2(double2 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from double3 to ulong3 + * Component wise conversion from double3 to uint3 * * Supported by API versions 21 and newer. */ -extern ulong3 __attribute__((const, overloadable))convert_ulong3(double3 v); +extern uint3 __attribute__((const, overloadable))convert_uint3(double3 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from double4 to ulong4 + * Component wise conversion from double4 to uint4 * * Supported by API versions 21 and newer. */ -extern ulong4 __attribute__((const, overloadable))convert_ulong4(double4 v); +extern uint4 __attribute__((const, overloadable))convert_uint4(double4 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from long2 to ulong2 + * Component wise conversion from long2 to uint2 * * Supported by API versions 21 and newer. */ -extern ulong2 __attribute__((const, overloadable))convert_ulong2(long2 v); +extern uint2 __attribute__((const, overloadable))convert_uint2(long2 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from long3 to ulong3 + * Component wise conversion from long3 to uint3 * * Supported by API versions 21 and newer. */ -extern ulong3 __attribute__((const, overloadable))convert_ulong3(long3 v); +extern uint3 __attribute__((const, overloadable))convert_uint3(long3 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from long4 to ulong4 + * Component wise conversion from long4 to uint4 * * Supported by API versions 21 and newer. */ -extern ulong4 __attribute__((const, overloadable))convert_ulong4(long4 v); +extern uint4 __attribute__((const, overloadable))convert_uint4(long4 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from ulong2 to ulong2 + * Component wise conversion from ulong2 to uint2 * * Supported by API versions 21 and newer. */ -extern ulong2 __attribute__((const, overloadable))convert_ulong2(ulong2 v); +extern uint2 __attribute__((const, overloadable))convert_uint2(ulong2 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from ulong3 to ulong3 + * Component wise conversion from ulong3 to uint3 * * Supported by API versions 21 and newer. */ -extern ulong3 __attribute__((const, overloadable))convert_ulong3(ulong3 v); +extern uint3 __attribute__((const, overloadable))convert_uint3(ulong3 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from ulong4 to ulong4 + * Component wise conversion from ulong4 to uint4 * * Supported by API versions 21 and newer. */ -extern ulong4 __attribute__((const, overloadable))convert_ulong4(ulong4 v); +extern uint4 __attribute__((const, overloadable))convert_uint4(ulong4 v); #endif #if (defined(RS_VERSION) && (RS_VERSION >= 21)) @@ -3791,33 +3791,6 @@ extern double4 __attribute__((const, overloadable))convert_double4(float4 v); #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from double2 to double2 - * - * Supported by API versions 21 and newer. - */ -extern double2 __attribute__((const, overloadable))convert_double2(double2 v); -#endif - -#if (defined(RS_VERSION) && (RS_VERSION >= 21)) -/* - * Component wise conversion from double3 to double3 - * - * Supported by API versions 21 and newer. - */ -extern double3 __attribute__((const, overloadable))convert_double3(double3 v); -#endif - -#if (defined(RS_VERSION) && (RS_VERSION >= 21)) -/* - * Component wise conversion from double4 to double4 - * - * Supported by API versions 21 and newer. - */ -extern double4 __attribute__((const, overloadable))convert_double4(double4 v); -#endif - -#if (defined(RS_VERSION) && (RS_VERSION >= 21)) -/* * Component wise conversion from char2 to double2 * * Supported by API versions 21 and newer. @@ -3980,60 +3953,6 @@ extern double4 __attribute__((const, overloadable))convert_double4(uint4 v); #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from long2 to double2 - * - * Supported by API versions 21 and newer. - */ -extern double2 __attribute__((const, overloadable))convert_double2(long2 v); -#endif - -#if (defined(RS_VERSION) && (RS_VERSION >= 21)) -/* - * Component wise conversion from long3 to double3 - * - * Supported by API versions 21 and newer. - */ -extern double3 __attribute__((const, overloadable))convert_double3(long3 v); -#endif - -#if (defined(RS_VERSION) && (RS_VERSION >= 21)) -/* - * Component wise conversion from long4 to double4 - * - * Supported by API versions 21 and newer. - */ -extern double4 __attribute__((const, overloadable))convert_double4(long4 v); -#endif - -#if (defined(RS_VERSION) && (RS_VERSION >= 21)) -/* - * Component wise conversion from ulong2 to double2 - * - * Supported by API versions 21 and newer. - */ -extern double2 __attribute__((const, overloadable))convert_double2(ulong2 v); -#endif - -#if (defined(RS_VERSION) && (RS_VERSION >= 21)) -/* - * Component wise conversion from ulong3 to double3 - * - * Supported by API versions 21 and newer. - */ -extern double3 __attribute__((const, overloadable))convert_double3(ulong3 v); -#endif - -#if (defined(RS_VERSION) && (RS_VERSION >= 21)) -/* - * Component wise conversion from ulong4 to double4 - * - * Supported by API versions 21 and newer. - */ -extern double4 __attribute__((const, overloadable))convert_double4(ulong4 v); -#endif - -#if (defined(RS_VERSION) && (RS_VERSION >= 21)) -/* * Component wise conversion from float2 to long2 * * Supported by API versions 21 and newer. @@ -4061,33 +3980,6 @@ extern long4 __attribute__((const, overloadable))convert_long4(float4 v); #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from double2 to long2 - * - * Supported by API versions 21 and newer. - */ -extern long2 __attribute__((const, overloadable))convert_long2(double2 v); -#endif - -#if (defined(RS_VERSION) && (RS_VERSION >= 21)) -/* - * Component wise conversion from double3 to long3 - * - * Supported by API versions 21 and newer. - */ -extern long3 __attribute__((const, overloadable))convert_long3(double3 v); -#endif - -#if (defined(RS_VERSION) && (RS_VERSION >= 21)) -/* - * Component wise conversion from double4 to long4 - * - * Supported by API versions 21 and newer. - */ -extern long4 __attribute__((const, overloadable))convert_long4(double4 v); -#endif - -#if (defined(RS_VERSION) && (RS_VERSION >= 21)) -/* * Component wise conversion from char2 to long2 * * Supported by API versions 21 and newer. @@ -4250,60 +4142,6 @@ extern long4 __attribute__((const, overloadable))convert_long4(uint4 v); #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from long2 to long2 - * - * Supported by API versions 21 and newer. - */ -extern long2 __attribute__((const, overloadable))convert_long2(long2 v); -#endif - -#if (defined(RS_VERSION) && (RS_VERSION >= 21)) -/* - * Component wise conversion from long3 to long3 - * - * Supported by API versions 21 and newer. - */ -extern long3 __attribute__((const, overloadable))convert_long3(long3 v); -#endif - -#if (defined(RS_VERSION) && (RS_VERSION >= 21)) -/* - * Component wise conversion from long4 to long4 - * - * Supported by API versions 21 and newer. - */ -extern long4 __attribute__((const, overloadable))convert_long4(long4 v); -#endif - -#if (defined(RS_VERSION) && (RS_VERSION >= 21)) -/* - * Component wise conversion from ulong2 to long2 - * - * Supported by API versions 21 and newer. - */ -extern long2 __attribute__((const, overloadable))convert_long2(ulong2 v); -#endif - -#if (defined(RS_VERSION) && (RS_VERSION >= 21)) -/* - * Component wise conversion from ulong3 to long3 - * - * Supported by API versions 21 and newer. - */ -extern long3 __attribute__((const, overloadable))convert_long3(ulong3 v); -#endif - -#if (defined(RS_VERSION) && (RS_VERSION >= 21)) -/* - * Component wise conversion from ulong4 to long4 - * - * Supported by API versions 21 and newer. - */ -extern long4 __attribute__((const, overloadable))convert_long4(ulong4 v); -#endif - -#if (defined(RS_VERSION) && (RS_VERSION >= 21)) -/* * Component wise conversion from float2 to ulong2 * * Supported by API versions 21 and newer. @@ -4331,33 +4169,6 @@ extern ulong4 __attribute__((const, overloadable))convert_ulong4(float4 v); #if (defined(RS_VERSION) && (RS_VERSION >= 21)) /* - * Component wise conversion from double2 to ulong2 - * - * Supported by API versions 21 and newer. - */ -extern ulong2 __attribute__((const, overloadable))convert_ulong2(double2 v); -#endif - -#if (defined(RS_VERSION) && (RS_VERSION >= 21)) -/* - * Component wise conversion from double3 to ulong3 - * - * Supported by API versions 21 and newer. - */ -extern ulong3 __attribute__((const, overloadable))convert_ulong3(double3 v); -#endif - -#if (defined(RS_VERSION) && (RS_VERSION >= 21)) -/* - * Component wise conversion from double4 to ulong4 - * - * Supported by API versions 21 and newer. - */ -extern ulong4 __attribute__((const, overloadable))convert_ulong4(double4 v); -#endif - -#if (defined(RS_VERSION) && (RS_VERSION >= 21)) -/* * Component wise conversion from char2 to ulong2 * * Supported by API versions 21 and newer. @@ -4518,60 +4329,6 @@ extern ulong3 __attribute__((const, overloadable))convert_ulong3(uint3 v); extern ulong4 __attribute__((const, overloadable))convert_ulong4(uint4 v); #endif -#if (defined(RS_VERSION) && (RS_VERSION >= 21)) -/* - * Component wise conversion from long2 to ulong2 - * - * Supported by API versions 21 and newer. - */ -extern ulong2 __attribute__((const, overloadable))convert_ulong2(long2 v); -#endif - -#if (defined(RS_VERSION) && (RS_VERSION >= 21)) -/* - * Component wise conversion from long3 to ulong3 - * - * Supported by API versions 21 and newer. - */ -extern ulong3 __attribute__((const, overloadable))convert_ulong3(long3 v); -#endif - -#if (defined(RS_VERSION) && (RS_VERSION >= 21)) -/* - * Component wise conversion from long4 to ulong4 - * - * Supported by API versions 21 and newer. - */ -extern ulong4 __attribute__((const, overloadable))convert_ulong4(long4 v); -#endif - -#if (defined(RS_VERSION) && (RS_VERSION >= 21)) -/* - * Component wise conversion from ulong2 to ulong2 - * - * Supported by API versions 21 and newer. - */ -extern ulong2 __attribute__((const, overloadable))convert_ulong2(ulong2 v); -#endif - -#if (defined(RS_VERSION) && (RS_VERSION >= 21)) -/* - * Component wise conversion from ulong3 to ulong3 - * - * Supported by API versions 21 and newer. - */ -extern ulong3 __attribute__((const, overloadable))convert_ulong3(ulong3 v); -#endif - -#if (defined(RS_VERSION) && (RS_VERSION >= 21)) -/* - * Component wise conversion from ulong4 to ulong4 - * - * Supported by API versions 21 and newer. - */ -extern ulong4 __attribute__((const, overloadable))convert_ulong4(ulong4 v); -#endif - #if (defined(RS_VERSION) && (RS_VERSION >= 9)) /* * Copy the sign bit from y to x. diff --git a/renderscript/include/rs_graphics.rsh b/renderscript/include/rs_graphics.rsh index 782b27f..1fcb7ed 100644 --- a/renderscript/include/rs_graphics.rsh +++ b/renderscript/include/rs_graphics.rsh @@ -23,6 +23,10 @@ #ifndef __RS_GRAPHICS_RSH__ #define __RS_GRAPHICS_RSH__ +#ifdef __LP64__ +//#error "RenderScript graphics is deprecated and not supported in 64bit mode." +#else + #include "rs_mesh.rsh" #include "rs_program.rsh" @@ -417,5 +421,6 @@ rsgMeshComputeBoundingBox(rs_mesh mesh, float3 *bBoxMin, float3 *bBoxMax) { bBoxMax->z = z2; } +#endif //__LP64__ #endif diff --git a/renderscript/include/rs_object.rsh b/renderscript/include/rs_object.rsh index 1fc3f83..ed6423b 100644 --- a/renderscript/include/rs_object.rsh +++ b/renderscript/include/rs_object.rsh @@ -52,6 +52,8 @@ extern void __attribute__((overloadable)) */ extern void __attribute__((overloadable)) rsSetObject(rs_script *dst, rs_script src); + +#ifndef __LP64__ /** * \overload */ @@ -87,6 +89,7 @@ extern void __attribute__((overloadable)) */ extern void __attribute__((overloadable)) rsSetObject(rs_font *dst, rs_font src); +#endif //__LP64__ /** * Sets the object to NULL. @@ -115,6 +118,9 @@ extern void __attribute__((overloadable)) */ extern void __attribute__((overloadable)) rsClearObject(rs_script *dst); + + +#ifndef __LP64__ /** * \overload */ @@ -150,7 +156,7 @@ extern void __attribute__((overloadable)) */ extern void __attribute__((overloadable)) rsClearObject(rs_font *dst); - +#endif //__LP64__ /** @@ -181,6 +187,8 @@ extern bool __attribute__((overloadable)) */ extern bool __attribute__((overloadable)) rsIsObject(rs_script); + +#ifndef __LP64__ /** * \overload */ @@ -216,5 +224,6 @@ extern bool __attribute__((overloadable)) */ extern bool __attribute__((overloadable)) rsIsObject(rs_font); +#endif //__LP64__ #endif diff --git a/renderscript/include/rs_types.rsh b/renderscript/include/rs_types.rsh index de09279..92ec56c 100644 --- a/renderscript/include/rs_types.rsh +++ b/renderscript/include/rs_types.rsh @@ -114,36 +114,44 @@ typedef uint32_t size_t; */ typedef int32_t ssize_t; +#ifndef __LP64__ +#define RS_BASE_OBJ typedef struct { const int* const p; } __attribute__((packed, aligned(4))) +#else +#define RS_BASE_OBJ typedef struct { const int* const p; const int* const r; const int* const v1; const int* const v2; } +#endif + /** * \brief Opaque handle to a RenderScript element. * * See: android.renderscript.Element */ -typedef struct { const int* const p; } __attribute__((packed, aligned(4))) rs_element; +RS_BASE_OBJ rs_element; /** * \brief Opaque handle to a RenderScript type. * * See: android.renderscript.Type */ -typedef struct { const int* const p; } __attribute__((packed, aligned(4))) rs_type; +RS_BASE_OBJ rs_type; /** * \brief Opaque handle to a RenderScript allocation. * * See: android.renderscript.Allocation */ -typedef struct { const int* const p; } __attribute__((packed, aligned(4))) rs_allocation; +RS_BASE_OBJ rs_allocation; /** * \brief Opaque handle to a RenderScript sampler object. * * See: android.renderscript.Sampler */ -typedef struct { const int* const p; } __attribute__((packed, aligned(4))) rs_sampler; +RS_BASE_OBJ rs_sampler; /** * \brief Opaque handle to a RenderScript script object. * * See: android.renderscript.ScriptC */ -typedef struct { const int* const p; } __attribute__((packed, aligned(4))) rs_script; +RS_BASE_OBJ rs_script; + +#ifndef __LP64__ /** * \brief Opaque handle to a RenderScript mesh object. * @@ -186,6 +194,7 @@ typedef struct { const int* const p; } __attribute__((packed, aligned(4))) rs_pr * See: android.renderscript.Font */ typedef struct { const int* const p; } __attribute__((packed, aligned(4))) rs_font; +#endif // __LP64__ /** * Vector version of the basic float type. @@ -418,6 +427,7 @@ typedef enum { // New API's #if (defined(RS_VERSION) && (RS_VERSION >= 16)) +#ifndef __LP64__ /** * Describes the way mesh vertex data is interpreted when rendering * @@ -456,6 +466,7 @@ typedef enum { */ RS_PRIMITIVE_INVALID = 100, } rs_primitive; +#endif // __LP64__ /** * \brief Enumeration for possible element data types @@ -535,6 +546,7 @@ typedef enum { RS_KIND_INVALID = 100, } rs_data_kind; +#ifndef __LP64__ typedef enum { /** * Always drawn @@ -610,6 +622,7 @@ typedef enum { RS_CULL_INVALID = 100, } rs_cull_mode; +#endif //__LP64__ typedef enum { RS_SAMPLER_NEAREST = 0, |