Remove the macro _RS_RUNTIME.
It's going away in the upcoming generator change. This is to isolate that
change.
Change-Id: I72c6e1c7706bf0c7306256e39c6d15e018c08716
diff --git a/scriptc/rs_core.rsh b/scriptc/rs_core.rsh
index c1c96aa..0159e6b 100644
--- a/scriptc/rs_core.rsh
+++ b/scriptc/rs_core.rsh
@@ -46,8 +46,6 @@
#ifndef __RS_CORE_RSH__
#define __RS_CORE_RSH__
-#define _RS_RUNTIME extern
-
#define RS_KERNEL __attribute__((kernel))
#include "rs_types.rsh"
@@ -199,6 +197,4 @@
rsForEach(rs_script script, rs_allocation input, rs_allocation output);
#endif
-#undef _RS_RUNTIME
-
#endif
diff --git a/scriptc/rs_math.rsh b/scriptc/rs_math.rsh
index 4d3124c..0a0e688 100644
--- a/scriptc/rs_math.rsh
+++ b/scriptc/rs_math.rsh
@@ -64,28 +64,28 @@
* @param low
* @param high
*/
-_RS_RUNTIME uint __attribute__((const, overloadable, always_inline)) rsClamp(uint amount, uint low, uint high);
+extern uint __attribute__((const, overloadable, always_inline)) rsClamp(uint amount, uint low, uint high);
/**
* \overload
*/
-_RS_RUNTIME int __attribute__((const, overloadable, always_inline)) rsClamp(int amount, int low, int high);
+extern int __attribute__((const, overloadable, always_inline)) rsClamp(int amount, int low, int high);
/**
* \overload
*/
-_RS_RUNTIME ushort __attribute__((const, overloadable, always_inline)) rsClamp(ushort amount, ushort low, ushort high);
+extern ushort __attribute__((const, overloadable, always_inline)) rsClamp(ushort amount, ushort low, ushort high);
/**
* \overload
*/
-_RS_RUNTIME short __attribute__((const, overloadable, always_inline)) rsClamp(short amount, short low, short high);
+extern short __attribute__((const, overloadable, always_inline)) rsClamp(short amount, short low, short high);
/**
* \overload
*/
-_RS_RUNTIME uchar __attribute__((const, overloadable, always_inline)) rsClamp(uchar amount, uchar low, uchar high);
+extern uchar __attribute__((const, overloadable, always_inline)) rsClamp(uchar amount, uchar low, uchar high);
/**
* \overload
*/
-_RS_RUNTIME char __attribute__((const, overloadable, always_inline)) rsClamp(char amount, char low, char high);
+extern char __attribute__((const, overloadable, always_inline)) rsClamp(char amount, char low, char high);
/**
@@ -202,7 +202,7 @@
*
* @return uchar4
*/
-_RS_RUNTIME uchar4 __attribute__((const, overloadable)) rsPackColorTo8888(float r, float g, float b);
+extern 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__((const, overloadable)) rsPackColorTo8888(float r, float g, float b, float a);
+extern 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__((const, overloadable)) rsPackColorTo8888(float3 color);
+extern 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__((const, overloadable)) rsPackColorTo8888(float4 color);
+extern 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 __attribute__((const)) rsUnpackColor8888(uchar4 c);
+extern float4 __attribute__((const)) rsUnpackColor8888(uchar4 c);
-_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);
+extern uchar4 __attribute__((const, overloadable)) rsYuvToRGBA_uchar4(uchar y, uchar u, uchar v);
+extern float4 __attribute__((const, overloadable)) rsYuvToRGBA_float4(uchar y, uchar u, uchar v);
#endif
diff --git a/scriptc/rs_matrix.rsh b/scriptc/rs_matrix.rsh
index 6faeca1..252a109 100644
--- a/scriptc/rs_matrix.rsh
+++ b/scriptc/rs_matrix.rsh
@@ -61,17 +61,17 @@
* \warning The order of the column and row parameters may be
* unexpected.
*/
-_RS_RUNTIME void __attribute__((overloadable))
+extern void __attribute__((overloadable))
rsMatrixSet(rs_matrix4x4 *m, uint32_t col, uint32_t row, float v);
/**
* \overload
*/
-_RS_RUNTIME void __attribute__((overloadable))
+extern void __attribute__((overloadable))
rsMatrixSet(rs_matrix3x3 *m, uint32_t col, uint32_t row, float v);
/**
* \overload
*/
-_RS_RUNTIME void __attribute__((overloadable))
+extern void __attribute__((overloadable))
rsMatrixSet(rs_matrix2x2 *m, uint32_t col, uint32_t row, float v);
/**
@@ -86,17 +86,17 @@
*
* @return float
*/
-_RS_RUNTIME float __attribute__((overloadable))
+extern float __attribute__((overloadable))
rsMatrixGet(const rs_matrix4x4 *m, uint32_t col, uint32_t row);
/**
* \overload
*/
-_RS_RUNTIME float __attribute__((overloadable))
+extern float __attribute__((overloadable))
rsMatrixGet(const rs_matrix3x3 *m, uint32_t col, uint32_t row);
/**
* \overload
*/
-_RS_RUNTIME float __attribute__((overloadable))
+extern float __attribute__((overloadable))
rsMatrixGet(const rs_matrix2x2 *m, uint32_t col, uint32_t row);
/**
@@ -411,37 +411,37 @@
* This function is available in API version 10-13. Starting with API 14,
* the function takes a const matrix as the first argument.
*/
-_RS_RUNTIME float4 __attribute__((overloadable))
+extern float4 __attribute__((overloadable))
rsMatrixMultiply(rs_matrix4x4 *m, float4 in);
/**
* \overload
*/
-_RS_RUNTIME float4 __attribute__((overloadable))
+extern float4 __attribute__((overloadable))
rsMatrixMultiply(rs_matrix4x4 *m, float3 in);
/**
* \overload
*/
-_RS_RUNTIME float4 __attribute__((overloadable))
+extern float4 __attribute__((overloadable))
rsMatrixMultiply(rs_matrix4x4 *m, float2 in);
/**
* \overload
*/
-_RS_RUNTIME float3 __attribute__((overloadable))
+extern float3 __attribute__((overloadable))
rsMatrixMultiply(rs_matrix3x3 *m, float3 in);
/**
* \overload
*/
-_RS_RUNTIME float3 __attribute__((overloadable))
+extern float3 __attribute__((overloadable))
rsMatrixMultiply(rs_matrix3x3 *m, float2 in);
/**
* \overload
*/
-_RS_RUNTIME float2 __attribute__((overloadable))
+extern float2 __attribute__((overloadable))
rsMatrixMultiply(rs_matrix2x2 *m, float2 in);
#else
/**
@@ -457,37 +457,37 @@
*
* This function is available starting with API version 14.
*/
-_RS_RUNTIME float4 __attribute__((overloadable))
+extern float4 __attribute__((overloadable))
rsMatrixMultiply(const rs_matrix4x4 *m, float4 in);
/**
* \overload
*/
-_RS_RUNTIME float4 __attribute__((overloadable))
+extern float4 __attribute__((overloadable))
rsMatrixMultiply(const rs_matrix4x4 *m, float3 in);
/**
* \overload
*/
-_RS_RUNTIME float4 __attribute__((overloadable))
+extern float4 __attribute__((overloadable))
rsMatrixMultiply(const rs_matrix4x4 *m, float2 in);
/**
* \overload
*/
-_RS_RUNTIME float3 __attribute__((overloadable))
+extern float3 __attribute__((overloadable))
rsMatrixMultiply(const rs_matrix3x3 *m, float3 in);
/**
* \overload
*/
-_RS_RUNTIME float3 __attribute__((overloadable))
+extern float3 __attribute__((overloadable))
rsMatrixMultiply(const rs_matrix3x3 *m, float2 in);
/**
* \overload
*/
-_RS_RUNTIME float2 __attribute__((overloadable))
+extern float2 __attribute__((overloadable))
rsMatrixMultiply(const rs_matrix2x2 *m, float2 in);
#endif