commit e7812284de67bb7e9ed110874fc6b92140f39642
author Stephen Hines <srhines@google.com> Wed Jun 19 00:07:04 2013 -0700
committer Stephen Hines <srhines@google.com> Mon Jun 24 21:21:58 2013 -0700
tree cea1de868e3b56f7cd50acdf65d41350c1a087be
parent da9f173879716082b590606389ae42c7ed15c947

Update header declarations for doxygen.

Change-Id: I7ca3c55801189b300ed0622c02611f41431082b7

scriptc/rs_allocation.rsh

diff --git a/scriptc/rs_allocation.rsh b/scriptc/rs_allocation.rsh
index 0f5e79d..7dffa54 100644
--- a/scriptc/rs_allocation.rsh
+++ b/scriptc/rs_allocation.rsh
@@ -134,17 +134,17 @@
  * Extract a single element from an allocation.
  */
 extern const void * __attribute__((overloadable))
-    rsGetElementAt(rs_allocation, uint32_t x);
+    rsGetElementAt(rs_allocation a, uint32_t x);
 /**
  * \overload
  */
 extern const void * __attribute__((overloadable))
-    rsGetElementAt(rs_allocation, uint32_t x, uint32_t y);
+    rsGetElementAt(rs_allocation a, uint32_t x, uint32_t y);
 /**
  * \overload
  */
 extern const void * __attribute__((overloadable))
-    rsGetElementAt(rs_allocation, uint32_t x, uint32_t y, uint32_t z);
+    rsGetElementAt(rs_allocation a, uint32_t x, uint32_t y, uint32_t z);
 
 
 #if (defined(RS_VERSION) && (RS_VERSION >= 18))

scriptc/rs_cl.rsh

diff --git a/scriptc/rs_cl.rsh b/scriptc/rs_cl.rsh
index 6dc971c..2ff5d8b 100644
--- a/scriptc/rs_cl.rsh
+++ b/scriptc/rs_cl.rsh
@@ -92,6 +92,25 @@
 
 // Float ops, 6.11.2
 
+#ifdef DOXYGEN
+
+#define FN_FUNC_FN(fnc)
+#define F_FUNC_FN(fnc)
+#define IN_FUNC_FN(fnc)
+#define FN_FUNC_FN_FN(fnc)
+#define F_FUNC_FN_FN(fnc)
+#define FN_FUNC_FN_F(fnc)
+#define FN_FUNC_FN_IN(fnc)
+#define FN_FUNC_FN_I(fnc)
+#define FN_FUNC_FN_PFN(fnc)
+#define FN_FUNC_FN_PIN(fnc)
+#define FN_FUNC_FN_FN_FN(fnc)
+#define FN_FUNC_FN_FN_F(fnc)
+#define FN_FUNC_FN_F_F(fnc)
+#define FN_FUNC_FN_FN_PIN(fnc)
+
+#else
+
 #define FN_FUNC_FN(fnc)                                                \
 _RS_RUNTIME float2 __attribute__((const, overloadable)) fnc(float2 v); \
 _RS_RUNTIME float3 __attribute__((const, overloadable)) fnc(float3 v); \
@@ -177,6 +196,8 @@
 _RS_RUNTIME float4 __attribute__((pure, overloadable)) \
         fnc(float4 v1, float4 v2, int4 *v3);
 
+#endif  // DOXYGEN
+
 
 /**
  * Return the inverse cosine.
@@ -750,13 +771,35 @@
 extern float __attribute__((const, overloadable)) trunc(float);
 FN_FUNC_FN(trunc)
 
+#ifdef DOXYGEN
+
+#define XN_FUNC_YN(typeout, fnc, typein)                                \
+extern typeout __attribute__((overloadable)) fnc(typein v);
+
+#define XN_FUNC_XN_XN_BODY(type, fnc, body)         \
+_RS_RUNTIME type __attribute__((overloadable))      \
+        fnc(type v1, type v2);
+
+#else
 
 #define XN_FUNC_YN(typeout, fnc, typein)                                      \
-extern typeout __attribute__((const, overloadable)) fnc(typein);              \
+extern typeout __attribute__((const, overloadable)) fnc(typein v);            \
 _RS_RUNTIME typeout##2 __attribute__((const, overloadable)) fnc(typein##2 v); \
 _RS_RUNTIME typeout##3 __attribute__((const, overloadable)) fnc(typein##3 v); \
 _RS_RUNTIME typeout##4 __attribute__((const, overloadable)) fnc(typein##4 v);
 
+#define XN_FUNC_XN_XN_BODY(type, fnc, body)              \
+_RS_RUNTIME type __attribute__((const, overloadable))    \
+        fnc(type v1, type v2);                           \
+_RS_RUNTIME type##2 __attribute__((const, overloadable)) \
+        fnc(type##2 v1, type##2 v2);                     \
+_RS_RUNTIME type##3 __attribute__((const, overloadable)) \
+        fnc(type##3 v1, type##3 v2);                     \
+_RS_RUNTIME type##4 __attribute__((const, overloadable)) \
+        fnc(type##4 v1, type##4 v2);
+
+#endif  // DOXYGEN
+
 #define UIN_FUNC_IN(fnc)          \
 XN_FUNC_YN(uchar, fnc, char)      \
 XN_FUNC_YN(ushort, fnc, short)    \
@@ -770,17 +813,6 @@
 XN_FUNC_YN(uint, fnc, uint)       \
 XN_FUNC_YN(int, fnc, int)
 
-
-#define XN_FUNC_XN_XN_BODY(type, fnc, body)              \
-_RS_RUNTIME type __attribute__((const, overloadable))    \
-        fnc(type v1, type v2);                           \
-_RS_RUNTIME type##2 __attribute__((const, overloadable)) \
-        fnc(type##2 v1, type##2 v2);                     \
-_RS_RUNTIME type##3 __attribute__((const, overloadable)) \
-        fnc(type##3 v1, type##3 v2);                     \
-_RS_RUNTIME type##4 __attribute__((const, overloadable)) \
-        fnc(type##4 v1, type##4 v2);
-
 #define IN_FUNC_IN_IN_BODY(fnc, body)   \
 XN_FUNC_XN_XN_BODY(uchar, fnc, body)    \
 XN_FUNC_XN_XN_BODY(char, fnc, body)     \
@@ -791,6 +823,7 @@
 XN_FUNC_XN_XN_BODY(float, fnc, body)
 
 /**
+ * \fn uchar abs(char)
  * Return the absolute value of a value.
  *
  * Supports 1,2,3,4 components of char, short, int.