commit 996e4dcc9c7aa280b1c129a44c0ccd00afc9bc8b
author Stephen Hines <srhines@google.com> Tue Aug 13 01:04:14 2013 -0700
committer Stephen Hines <srhines@google.com> Tue Aug 13 01:04:14 2013 -0700
tree 4c4c50b814a763964360ae882fd1971d896584ee
parent a644b2aeb1a597f47cb8a3282b05a2955e9f3e86

Update prebuilts for LLVM merge to r187914.

Change-Id: Ia02e3e03965f501117b05fb0691f69a89e7d1772

renderscript/include/rs_math.rsh

diff --git a/renderscript/include/rs_math.rsh b/renderscript/include/rs_math.rsh
index 73040b3..4d3124c 100644
--- a/renderscript/include/rs_math.rsh
+++ b/renderscript/include/rs_math.rsh
@@ -49,7 +49,7 @@
 /**
  * Returns the fractional part of a float
  */
-extern float __attribute__((overloadable))
+extern float __attribute__((const, overloadable))
     rsFrac(float);
 
 
@@ -64,28 +64,28 @@
  * @param low
  * @param high
  */
-_RS_RUNTIME uint __attribute__((overloadable, always_inline)) rsClamp(uint amount, uint low, uint high);
+_RS_RUNTIME uint __attribute__((const, overloadable, always_inline)) rsClamp(uint amount, uint low, uint high);
 
 /**
  * \overload
  */
-_RS_RUNTIME int __attribute__((overloadable, always_inline)) rsClamp(int amount, int low, int high);
+_RS_RUNTIME int __attribute__((const, overloadable, always_inline)) rsClamp(int amount, int low, int high);
 /**
  * \overload
  */
-_RS_RUNTIME ushort __attribute__((overloadable, always_inline)) rsClamp(ushort amount, ushort low, ushort high);
+_RS_RUNTIME ushort __attribute__((const, overloadable, always_inline)) rsClamp(ushort amount, ushort low, ushort high);
 /**
  * \overload
  */
-_RS_RUNTIME short __attribute__((overloadable, always_inline)) rsClamp(short amount, short low, short high);
+_RS_RUNTIME short __attribute__((const, overloadable, always_inline)) rsClamp(short amount, short low, short high);
 /**
  * \overload
  */
-_RS_RUNTIME uchar __attribute__((overloadable, always_inline)) rsClamp(uchar amount, uchar low, uchar high);
+_RS_RUNTIME uchar __attribute__((const, overloadable, always_inline)) rsClamp(uchar amount, uchar low, uchar high);
 /**
  * \overload
  */
-_RS_RUNTIME char __attribute__((overloadable, always_inline)) rsClamp(char amount, char low, char high);
+_RS_RUNTIME char __attribute__((const, overloadable, always_inline)) rsClamp(char amount, char low, char high);
 
 
 /**
@@ -202,7 +202,7 @@
  *
  * @return uchar4
  */
-_RS_RUNTIME uchar4 __attribute__((overloadable)) rsPackColorTo8888(float r, float g, float b);
+_RS_RUNTIME uchar4 __attribute__((const, overloadable)) rsPackColorTo8888(float r, float g, float b);
 
 /**
  * Pack floating point (0-1) RGBA values into a uchar4.
@@ -214,7 +214,7 @@
  *
  * @return uchar4
  */
-_RS_RUNTIME uchar4 __attribute__((overloadable)) rsPackColorTo8888(float r, float g, float b, float a);
+_RS_RUNTIME uchar4 __attribute__((const, overloadable)) rsPackColorTo8888(float r, float g, float b, float a);
 
 /**
  * Pack floating point (0-1) RGB values into a uchar4.  The alpha component is
@@ -224,7 +224,7 @@
  *
  * @return uchar4
  */
-_RS_RUNTIME uchar4 __attribute__((overloadable)) rsPackColorTo8888(float3 color);
+_RS_RUNTIME uchar4 __attribute__((const, overloadable)) rsPackColorTo8888(float3 color);
 
 /**
  * Pack floating point (0-1) RGBA values into a uchar4.
@@ -233,7 +233,7 @@
  *
  * @return uchar4
  */
-_RS_RUNTIME uchar4 __attribute__((overloadable)) rsPackColorTo8888(float4 color);
+_RS_RUNTIME uchar4 __attribute__((const, overloadable)) rsPackColorTo8888(float4 color);
 
 /**
  * Unpack a uchar4 color to float4.  The resulting float range will be (0-1).
@@ -242,10 +242,10 @@
  *
  * @return float4
  */
-_RS_RUNTIME float4 rsUnpackColor8888(uchar4 c);
+_RS_RUNTIME float4 __attribute__((const)) rsUnpackColor8888(uchar4 c);
 
-_RS_RUNTIME uchar4 __attribute__((overloadable)) rsYuvToRGBA_uchar4(uchar y, uchar u, uchar v);
-_RS_RUNTIME float4 __attribute__((overloadable)) rsYuvToRGBA_float4(uchar y, uchar u, uchar v);
+_RS_RUNTIME uchar4 __attribute__((const, overloadable)) rsYuvToRGBA_uchar4(uchar y, uchar u, uchar v);
+_RS_RUNTIME float4 __attribute__((const, overloadable)) rsYuvToRGBA_float4(uchar y, uchar u, uchar v);
 
 
 #endif