From 6568896117197216de4877a31c382c7769617a10 Mon Sep 17 00:00:00 2001 From: Stephen Hines Date: Fri, 15 Oct 2010 12:47:49 -0700 Subject: Add support for rsDebug with 64-bit types. Bug: 3099081 Change-Id: Ieb3af7757489876ef951be8527aa73f69e1481fd --- libs/rs/scriptc/rs_core.rsh | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'libs/rs/scriptc') diff --git a/libs/rs/scriptc/rs_core.rsh b/libs/rs/scriptc/rs_core.rsh index 9950184..0e0532c 100644 --- a/libs/rs/scriptc/rs_core.rsh +++ b/libs/rs/scriptc/rs_core.rsh @@ -11,6 +11,8 @@ extern void __attribute__((overloadable)) extern void __attribute__((overloadable)) rsDebug(const char *, float, float, float, float); extern void __attribute__((overloadable)) + rsDebug(const char *, double); +extern void __attribute__((overloadable)) rsDebug(const char *, const rs_matrix4x4 *); extern void __attribute__((overloadable)) rsDebug(const char *, const rs_matrix3x3 *); @@ -21,6 +23,14 @@ extern void __attribute__((overloadable)) extern void __attribute__((overloadable)) rsDebug(const char *, uint); extern void __attribute__((overloadable)) + rsDebug(const char *, long); +extern void __attribute__((overloadable)) + rsDebug(const char *, unsigned long); +extern void __attribute__((overloadable)) + rsDebug(const char *, long long); +extern void __attribute__((overloadable)) + rsDebug(const char *, unsigned long long); +extern void __attribute__((overloadable)) rsDebug(const char *, const void *); #define RS_DEBUG(a) rsDebug(#a, a) #define RS_DEBUG_MARKER rsDebug(__FILE__, __LINE__) @@ -803,7 +813,7 @@ static void rsQuaternionGetMatrixUnit(rs_matrix4x4 *m, const rs_quaternion *q) { ///////////////////////////////////////////////////// // utility funcs ///////////////////////////////////////////////////// -void __attribute__((overloadable)) +__inline__ static void __attribute__((overloadable, always_inline)) rsExtractFrustumPlanes(const rs_matrix4x4 *modelViewProj, float4 *left, float4 *right, float4 *top, float4 *bottom, @@ -853,7 +863,7 @@ rsExtractFrustumPlanes(const rs_matrix4x4 *modelViewProj, *far /= len; } -bool __attribute__((overloadable)) +__inline__ static bool __attribute__((overloadable, always_inline)) rsIsSphereInFrustum(float4 *sphere, float4 *left, float4 *right, float4 *top, float4 *bottom, -- cgit v1.1