Merge \"Revert \"Make RenderScript constants variables instead of macros.\"\"
am: 847ab1a6f9
Change-Id: I2ccfe12eff7b05e239ddce8652c869daa3b5d12f
diff --git a/api/GenerateHeaderFiles.cpp b/api/GenerateHeaderFiles.cpp
index 9f40d3d..ce778b3 100644
--- a/api/GenerateHeaderFiles.cpp
+++ b/api/GenerateHeaderFiles.cpp
@@ -120,13 +120,7 @@
const Constant* constant = spec.getConstant();
VersionInfo info = spec.getVersionInfo();
writeVersionGuardStart(file, info, constant->getFinalVersion());
-
- *file << "#if (defined(RS_VERSION) && (RS_VERSION >= UNRELEASED))\n";
- *file << "extern const " << spec.getType() << " " << constant->getName() << ";\n";
- *file << "#else\n";
- *file << "#define " << constant->getName() << " " << spec.getValue() << "\n";
- *file << "#endif\n\n";
-
+ *file << "#define " << constant->getName() << " " << spec.getValue() << "\n\n";
writeVersionGuardEnd(file, info);
}
diff --git a/api/Generator.cpp b/api/Generator.cpp
index f67e473..456f214 100644
--- a/api/Generator.cpp
+++ b/api/Generator.cpp
@@ -62,7 +62,6 @@
* [version: ({Starting API level} [ {Last API level that supports this.}] | UNRELEASED)
* [size: {32 or 64. Used if this is available only for 32 or 64 bit code.}]
* value: {The value of the constant.}
- * type: {The type of the constant.}
* [hidden:] ...If present, don't document the constant. Omit the following two fields.
* [deprecated: [{Deprecation message.}] ... This is deprecated. Compiler will issue a wrning.
* summary: {A one line string describing this section.}
diff --git a/api/Specification.cpp b/api/Specification.cpp
index 67b8973..b0ebe91 100644
--- a/api/Specification.cpp
+++ b/api/Specification.cpp
@@ -382,9 +382,6 @@
if (scanner->findTag("value:")) {
spec->mValue = scanner->getValue();
}
- if (scanner->findTag("type:")) {
- spec->mType = scanner->getValue();
- }
constant->scanDocumentationTags(scanner, created, specFile);
scanner->findTag("end:");
diff --git a/api/Specification.h b/api/Specification.h
index c3c556b..bcd5737 100644
--- a/api/Specification.h
+++ b/api/Specification.h
@@ -266,13 +266,11 @@
Constant* mConstant; // Not owned
std::string mValue; // E.g. "3.1415"
- std::string mType;
public:
ConstantSpecification(Constant* constant) : mConstant(constant) {}
Constant* getConstant() const { return mConstant; }
std::string getValue() const { return mValue; }
- std::string getType() const { return mType; }
// Parse a constant specification and add it to specFile.
static void scanConstantSpecification(Scanner* scanner, SpecFile* specFile, unsigned int maxApiLevel);
diff --git a/api/rs_math.spec b/api/rs_math.spec
index 15378ad..b4093e8 100644
--- a/api/rs_math.spec
+++ b/api/rs_math.spec
@@ -51,7 +51,6 @@
# TODO Add f16 versions of these constants.
constant: M_1_PI
value: 0.318309886183790671537767526745028724f
-type: float
summary: 1 / pi, as a 32 bit float
description:
The inverse of pi, as a 32 bit float.
@@ -59,7 +58,6 @@
constant: M_2_PI
value: 0.636619772367581343075535053490057448f
-type: float
summary: 2 / pi, as a 32 bit float
description:
2 divided by pi, as a 32 bit float.
@@ -67,7 +65,6 @@
constant: M_2_PIl
value: 0.636619772367581343075535053490057448f
-type: float
hidden:
deprecated: 22, Use M_2_PI instead.
summary: 2 / pi, as a 32 bit float
@@ -77,7 +74,6 @@
constant: M_2_SQRTPI
value: 1.128379167095512573896158903121545172f
-type: float
summary: 2 / sqrt(pi), as a 32 bit float
description:
2 divided by the square root of pi, as a 32 bit float.
@@ -85,7 +81,6 @@
constant: M_E
value: 2.718281828459045235360287471352662498f
-type: float
summary: e, as a 32 bit float
description:
The number e, the base of the natural logarithm, as a 32 bit float.
@@ -93,7 +88,6 @@
constant: M_LN10
value: 2.302585092994045684017991454684364208f
-type: float
summary: log_e(10), as a 32 bit float
description:
The natural logarithm of 10, as a 32 bit float.
@@ -101,7 +95,6 @@
constant: M_LN2
value: 0.693147180559945309417232121458176568f
-type: float
summary: log_e(2), as a 32 bit float
description:
The natural logarithm of 2, as a 32 bit float.
@@ -109,7 +102,6 @@
constant: M_LOG10E
value: 0.434294481903251827651128918916605082f
-type: float
summary: log_10(e), as a 32 bit float
description:
The logarithm base 10 of e, as a 32 bit float.
@@ -117,7 +109,6 @@
constant: M_LOG2E
value: 1.442695040888963407359924681001892137f
-type: float
summary: log_2(e), as a 32 bit float
description:
The logarithm base 2 of e, as a 32 bit float.
@@ -125,7 +116,6 @@
constant: M_PI
value: 3.141592653589793238462643383279502884f
-type: float
summary: pi, as a 32 bit float
description:
The constant pi, as a 32 bit float.
@@ -133,7 +123,6 @@
constant: M_PI_2
value: 1.570796326794896619231321691639751442f
-type: float
summary: pi / 2, as a 32 bit float
description:
Pi divided by 2, as a 32 bit float.
@@ -141,7 +130,6 @@
constant: M_PI_4
value: 0.785398163397448309615660845819875721f
-type: float
summary: pi / 4, as a 32 bit float
description:
Pi divided by 4, as a 32 bit float.
@@ -149,7 +137,6 @@
constant: M_SQRT1_2
value: 0.707106781186547524400844362104849039f
-type: float
summary: 1 / sqrt(2), as a 32 bit float
description:
The inverse of the square root of 2, as a 32 bit float.
@@ -157,7 +144,6 @@
constant: M_SQRT2
value: 1.414213562373095048801688724209698079f
-type: float
summary: sqrt(2), as a 32 bit float
description:
The square root of 2, as a 32 bit float.
diff --git a/driver/runtime/rs_core.c b/driver/runtime/rs_core.c
index 6e4c6d0..73fc503 100644
--- a/driver/runtime/rs_core.c
+++ b/driver/runtime/rs_core.c
@@ -3,37 +3,6 @@
#include "rsCpuCoreRuntime.h"
-/* Definition of constants */
-#if (defined(RS_VERSION) && (RS_VERSION >= UNRELEASED))
-const float M_1_PI = 0.318309886183790671537767526745028724f;
-
-const float M_2_PI = 0.636619772367581343075535053490057448f;
-
-const float M_2_PIl = 0.636619772367581343075535053490057448f;
-
-const float M_2_SQRTPI = 1.128379167095512573896158903121545172f;
-
-const float M_E = 2.718281828459045235360287471352662498f;
-
-const float M_LN10 = 2.302585092994045684017991454684364208f;
-
-const float M_LN2 = 0.693147180559945309417232121458176568f;
-
-const float M_LOG10E = 0.434294481903251827651128918916605082f;
-
-const float M_LOG2E = 1.442695040888963407359924681001892137f;
-
-const float M_PI = 3.141592653589793238462643383279502884f;
-
-const float M_PI_2 = 1.570796326794896619231321691639751442f;
-
-const float M_PI_4 = 0.785398163397448309615660845819875721f;
-
-const float M_SQRT1_2 = 0.707106781186547524400844362104849039f;
-
-const float M_SQRT2 = 1.414213562373095048801688724209698079f;
-#endif // (defined(RS_VERSION) && (RS_VERSION >= UNRELEASED))
-
extern float __attribute__((overloadable)) rsFrac(float v) {
int i = (int)floor(v);
return fmin(v - i, 0x1.fffffep-1f);
diff --git a/scriptc/rs_math.rsh b/scriptc/rs_math.rsh
index 849b52e..3d034d0 100644
--- a/scriptc/rs_math.rsh
+++ b/scriptc/rs_math.rsh
@@ -58,22 +58,14 @@
*
* The inverse of pi, as a 32 bit float.
*/
-#if (defined(RS_VERSION) && (RS_VERSION >= UNRELEASED))
-extern const float M_1_PI;
-#else
#define M_1_PI 0.318309886183790671537767526745028724f
-#endif
/*
* M_2_PI: 2 / pi, as a 32 bit float
*
* 2 divided by pi, as a 32 bit float.
*/
-#if (defined(RS_VERSION) && (RS_VERSION >= UNRELEASED))
-extern const float M_2_PI;
-#else
#define M_2_PI 0.636619772367581343075535053490057448f
-#endif
/*
* M_2_PIl: 2 / pi, as a 32 bit float
@@ -82,132 +74,84 @@
*
* 2 divided by pi, as a 32 bit float.
*/
-#if (defined(RS_VERSION) && (RS_VERSION >= UNRELEASED))
-extern const float M_2_PIl;
-#else
#define M_2_PIl 0.636619772367581343075535053490057448f
-#endif
/*
* M_2_SQRTPI: 2 / sqrt(pi), as a 32 bit float
*
* 2 divided by the square root of pi, as a 32 bit float.
*/
-#if (defined(RS_VERSION) && (RS_VERSION >= UNRELEASED))
-extern const float M_2_SQRTPI;
-#else
#define M_2_SQRTPI 1.128379167095512573896158903121545172f
-#endif
/*
* M_E: e, as a 32 bit float
*
* The number e, the base of the natural logarithm, as a 32 bit float.
*/
-#if (defined(RS_VERSION) && (RS_VERSION >= UNRELEASED))
-extern const float M_E;
-#else
#define M_E 2.718281828459045235360287471352662498f
-#endif
/*
* M_LN10: log_e(10), as a 32 bit float
*
* The natural logarithm of 10, as a 32 bit float.
*/
-#if (defined(RS_VERSION) && (RS_VERSION >= UNRELEASED))
-extern const float M_LN10;
-#else
#define M_LN10 2.302585092994045684017991454684364208f
-#endif
/*
* M_LN2: log_e(2), as a 32 bit float
*
* The natural logarithm of 2, as a 32 bit float.
*/
-#if (defined(RS_VERSION) && (RS_VERSION >= UNRELEASED))
-extern const float M_LN2;
-#else
#define M_LN2 0.693147180559945309417232121458176568f
-#endif
/*
* M_LOG10E: log_10(e), as a 32 bit float
*
* The logarithm base 10 of e, as a 32 bit float.
*/
-#if (defined(RS_VERSION) && (RS_VERSION >= UNRELEASED))
-extern const float M_LOG10E;
-#else
#define M_LOG10E 0.434294481903251827651128918916605082f
-#endif
/*
* M_LOG2E: log_2(e), as a 32 bit float
*
* The logarithm base 2 of e, as a 32 bit float.
*/
-#if (defined(RS_VERSION) && (RS_VERSION >= UNRELEASED))
-extern const float M_LOG2E;
-#else
#define M_LOG2E 1.442695040888963407359924681001892137f
-#endif
/*
* M_PI: pi, as a 32 bit float
*
* The constant pi, as a 32 bit float.
*/
-#if (defined(RS_VERSION) && (RS_VERSION >= UNRELEASED))
-extern const float M_PI;
-#else
#define M_PI 3.141592653589793238462643383279502884f
-#endif
/*
* M_PI_2: pi / 2, as a 32 bit float
*
* Pi divided by 2, as a 32 bit float.
*/
-#if (defined(RS_VERSION) && (RS_VERSION >= UNRELEASED))
-extern const float M_PI_2;
-#else
#define M_PI_2 1.570796326794896619231321691639751442f
-#endif
/*
* M_PI_4: pi / 4, as a 32 bit float
*
* Pi divided by 4, as a 32 bit float.
*/
-#if (defined(RS_VERSION) && (RS_VERSION >= UNRELEASED))
-extern const float M_PI_4;
-#else
#define M_PI_4 0.785398163397448309615660845819875721f
-#endif
/*
* M_SQRT1_2: 1 / sqrt(2), as a 32 bit float
*
* The inverse of the square root of 2, as a 32 bit float.
*/
-#if (defined(RS_VERSION) && (RS_VERSION >= UNRELEASED))
-extern const float M_SQRT1_2;
-#else
#define M_SQRT1_2 0.707106781186547524400844362104849039f
-#endif
/*
* M_SQRT2: sqrt(2), as a 32 bit float
*
* The square root of 2, as a 32 bit float.
*/
-#if (defined(RS_VERSION) && (RS_VERSION >= UNRELEASED))
-extern const float M_SQRT2;
-#else
#define M_SQRT2 1.414213562373095048801688724209698079f
-#endif
/*
* abs: Absolute value of an integer
