summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jason Sams <rjsams@android.com> 2010-10-15 18:18:51 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2010-10-15 18:18:51 -0700
commitcfa25f20ffdcb9fdd938ae6bf75f0f4a3b0820a6 (patch)
tree95bab2a0d9f56cadd12fbfda1e645956ee9efe0a
parente2cb1f005350cf1116d49dbe9456a2cafb1ec8dc (diff)
parentec13bf79d9474972e1737a13598b1f216b342726 (diff)
Merge "Fix header file to always inline stub functions."
-rw-r--r--libs/rs/scriptc/rs_graphics.rsh2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/rs/scriptc/rs_graphics.rsh b/libs/rs/scriptc/rs_graphics.rsh
index ac6f8ccc3768..7c67c0d89dfc 100644
--- a/libs/rs/scriptc/rs_graphics.rsh
+++ b/libs/rs/scriptc/rs_graphics.rsh
@@ -89,7 +89,7 @@ extern void __attribute__((overloadable))
extern void __attribute__((overloadable))
rsgMeshComputeBoundingBox(rs_mesh mesh, float *minX, float *minY, float *minZ,
float *maxX, float *maxY, float *maxZ);
-void __attribute__((overloadable))
+__inline__ static void __attribute__((overloadable, always_inline))
rsgMeshComputeBoundingBox(rs_mesh mesh, float3 *bBoxMin, float3 *bBoxMax) {
float x1, y1, z1, x2, y2, z2;
rsgMeshComputeBoundingBox(mesh, &x1, &y1, &z1, &x2, &y2, &z2);