diff options
| -rw-r--r-- | api/GenerateDocumentation.cpp | 36 | ||||
| -rw-r--r-- | api/GenerateHeaderFiles.cpp | 80 | ||||
| -rw-r--r-- | api/Specification.cpp | 36 | ||||
| -rw-r--r-- | api/Specification.h | 18 | ||||
| -rw-r--r-- | api/Utilities.cpp | 43 | ||||
| -rw-r--r-- | api/Utilities.h | 7 | ||||
| -rw-r--r-- | api/rs_convert.spec | 10 | ||||
| -rw-r--r-- | api/rs_for_each.spec | 4 | ||||
| -rw-r--r-- | api/rs_graphics.spec | 220 | ||||
| -rw-r--r-- | api/rs_math.spec | 6 | ||||
| -rw-r--r-- | api/rs_object_info.spec | 2 | ||||
| -rw-r--r-- | api/rs_value_types.spec | 90 | ||||
| -rwxr-xr-x | driver/runtime/Android.mk | 18 | ||||
| -rw-r--r-- | java/tests/RsBLAS_Benchmark/AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | scriptc/rs_convert.rsh | 10 | ||||
| -rw-r--r-- | scriptc/rs_graphics.rsh | 574 | ||||
| -rw-r--r-- | scriptc/rs_math.rsh | 42 | ||||
| -rw-r--r-- | scriptc/rs_object_info.rsh | 6 | ||||
| -rwxr-xr-x | update_rs_prebuilts.sh | 2 |
19 files changed, 313 insertions, 895 deletions
diff --git a/api/GenerateDocumentation.cpp b/api/GenerateDocumentation.cpp index 565f4fb3..e5f238aa 100644 --- a/api/GenerateDocumentation.cpp +++ b/api/GenerateDocumentation.cpp @@ -54,11 +54,9 @@ static void writeHeader(GeneratedFile* file, bool forVerification, const string& *file << "page.title=RenderScript " << title << "\n\n"; *file << "@jd:body\n\n"; } - *file << "<div class='renderscript'>\n"; } static void writeFooter(GeneratedFile* file, bool forVerification) { - *file << "</div>\n"; if (forVerification) { *file << "</body></html>\n"; } @@ -322,7 +320,7 @@ static void writeHtmlVersionTag(GeneratedFile* file, VersionInfo info) { if (info.minVersion <= 1) { // No minimum if (info.maxVersion > 0) { - stream << "Removed from " << mid << info.maxVersion + 1 << " and beyond"; + stream << "Removed from " << mid << info.maxVersion + 1; } } else { if (info.maxVersion == 0) { @@ -340,26 +338,22 @@ static void writeHtmlVersionTag(GeneratedFile* file, VersionInfo info) { } } -static void writeDetailedTypeSpecification(GeneratedFile* file, const TypeSpecification* spec) { - switch (spec->getKind()) { - case SIMPLE: { - Type* type = spec->getType(); - *file << "<p>A typedef of: " << spec->getSimpleType() - << makeAttributeTag(spec->getAttribute(), "", type->deprecated(), - type->getDeprecatedMessage()) +static void writeDetailedTypeSpecification(GeneratedFile* file, const TypeSpecification* type) { + switch (type->getKind()) { + case SIMPLE: + *file << "<p>A typedef of: " << type->getSimpleType() << " "; - writeHtmlVersionTag(file, spec->getVersionInfo()); + writeHtmlVersionTag(file, type->getVersionInfo()); *file << "</p>\n"; break; - } case ENUM: { *file << "<p>An enum with the following values: \n"; - writeHtmlVersionTag(file, spec->getVersionInfo()); + writeHtmlVersionTag(file, type->getVersionInfo()); *file << "</p>\n"; *file << " <table class='jd-tagtable'><tbody>\n"; - const vector<string>& values = spec->getValues(); - const vector<string>& valueComments = spec->getValueComments(); + const vector<string>& values = type->getValues(); + const vector<string>& valueComments = type->getValueComments(); for (size_t i = 0; i < values.size(); i++) { *file << " <tr><th>" << values[i] << "</th><td>"; if (valueComments.size() > i) { @@ -372,12 +366,12 @@ static void writeDetailedTypeSpecification(GeneratedFile* file, const TypeSpecif } case STRUCT: { *file << "<p>A structure with the following fields: "; - writeHtmlVersionTag(file, spec->getVersionInfo()); + writeHtmlVersionTag(file, type->getVersionInfo()); *file << "</p>\n"; *file << " <table class='jd-tagtable'><tbody>\n"; - const vector<string>& fields = spec->getFields(); - const vector<string>& fieldComments = spec->getFieldComments(); + const vector<string>& fields = type->getFields(); + const vector<string>& fieldComments = type->getFieldComments(); for (size_t i = 0; i < fields.size(); i++) { *file << " <tr><th>" << fields[i] << "</th><td>"; if (fieldComments.size() > i && !fieldComments[i].empty()) { @@ -472,7 +466,7 @@ static bool writeDetailedConstant(GeneratedFile* file, Constant* constant) { } const string& name = constant->getName(); - *file << "<a name='android_rs:" << name << "'></a>\n"; + *file << "<a id='android_rs:" << name << "'></a>\n"; *file << "<div class='jd-details'>\n"; *file << " <h4 class='jd-details-title'>\n"; *file << " <span class='sympad'>" << name << "</span>\n"; @@ -511,7 +505,7 @@ static bool writeDetailedType(GeneratedFile* file, Type* type) { } const string& name = type->getName(); - *file << "<a name='android_rs:" << name << "'></a>\n"; + *file << "<a id='android_rs:" << name << "'></a>\n"; *file << "<div class='jd-details'>\n"; *file << " <h4 class='jd-details-title'>\n"; *file << " <span class='sympad'>" << name << "</span>\n"; @@ -540,7 +534,7 @@ static bool writeDetailedFunction(GeneratedFile* file, Function* function) { } const string& name = function->getName(); - *file << "<a name='android_rs:" << name << "'></a>\n"; + *file << "<a id='android_rs:" << name << "'></a>\n"; *file << "<div class='jd-details'>\n"; *file << " <h4 class='jd-details-title'>\n"; *file << " <span class='sympad'>" << name << "</span>\n"; diff --git a/api/GenerateHeaderFiles.cpp b/api/GenerateHeaderFiles.cpp index e908ff1b..97ccab61 100644 --- a/api/GenerateHeaderFiles.cpp +++ b/api/GenerateHeaderFiles.cpp @@ -38,37 +38,27 @@ static string makeGuardString(const string& filename) { return s; } -/* Write #ifdef's that ensure that the specified version is present. If we're at the final version, - * add a check on a flag that can be set for internal builds. This enables us to keep supporting - * old APIs in the runtime code. - */ -static void writeVersionGuardStart(GeneratedFile* file, VersionInfo info, int finalVersion) { +// Write #ifdef's that ensure that the specified version is present +static void writeVersionGuardStart(GeneratedFile* file, VersionInfo info) { if (info.intSize == 32) { *file << "#ifndef __LP64__\n"; } else if (info.intSize == 64) { *file << "#ifdef __LP64__\n"; } - ostringstream checkMaxVersion; - if (info.maxVersion > 0) { - checkMaxVersion << "("; - if (info.maxVersion == finalVersion) { - checkMaxVersion << "defined(RS_DECLARE_EXPIRED_APIS) || "; - } - checkMaxVersion << "RS_VERSION <= " << info.maxVersion << ")"; - } - if (info.minVersion <= 1) { // No minimum if (info.maxVersion > 0) { - *file << "#if !defined(RS_VERSION) || " << checkMaxVersion.str() << "\n"; + *file << "#if !defined(RS_VERSION) || (RS_VERSION <= " << info.maxVersion << ")\n"; } } else { - *file << "#if (defined(RS_VERSION) && (RS_VERSION >= " << info.minVersion << ")"; - if (info.maxVersion > 0) { - *file << " && " << checkMaxVersion.str(); + if (info.maxVersion == 0) { + // No maximum + *file << "#if (defined(RS_VERSION) && (RS_VERSION >= " << info.minVersion << "))\n"; + } else { + *file << "#if (defined(RS_VERSION) && (RS_VERSION >= " << info.minVersion + << ") && (RS_VERSION <= " << info.maxVersion << "))\n"; } - *file << ")\n"; } } @@ -117,29 +107,22 @@ static void writeConstantComment(GeneratedFile* file, const Constant& constant) } static void writeConstantSpecification(GeneratedFile* file, const ConstantSpecification& spec) { - const Constant* constant = spec.getConstant(); VersionInfo info = spec.getVersionInfo(); - writeVersionGuardStart(file, info, constant->getFinalVersion()); - *file << "#define " << constant->getName() << " " << spec.getValue() << "\n\n"; + writeVersionGuardStart(file, info); + *file << "#define " << spec.getConstant()->getName() << " " << spec.getValue() << "\n\n"; writeVersionGuardEnd(file, info); } static void writeTypeSpecification(GeneratedFile* file, const TypeSpecification& spec) { - const Type* type = spec.getType(); - const string& typeName = type->getName(); + const string& typeName = spec.getType()->getName(); const VersionInfo info = spec.getVersionInfo(); - writeVersionGuardStart(file, info, type->getFinalVersion()); - - const string attribute = - makeAttributeTag(spec.getAttribute(), "", type->getDeprecatedApiLevel(), - type->getDeprecatedMessage()); - *file << "typedef "; + writeVersionGuardStart(file, info); switch (spec.getKind()) { case SIMPLE: - *file << spec.getSimpleType() << attribute; + *file << "typedef " << spec.getSimpleType() << " " << typeName << ";\n"; break; case ENUM: { - *file << "enum" << attribute << " "; + *file << "typedef enum "; const string name = spec.getEnumName(); if (!name.empty()) { *file << name << " "; @@ -159,11 +142,11 @@ static void writeTypeSpecification(GeneratedFile* file, const TypeSpecification& } *file << "\n"; } - *file << "}"; + *file << "} " << typeName << ";\n"; break; } case STRUCT: { - *file << "struct" << attribute << " "; + *file << "typedef struct "; const string name = spec.getStructName(); if (!name.empty()) { *file << name << " "; @@ -179,12 +162,15 @@ static void writeTypeSpecification(GeneratedFile* file, const TypeSpecification& } *file << "\n"; } - *file << "}"; + *file << "} "; + const string attrib = spec.getAttrib(); + if (!attrib.empty()) { + *file << attrib << " "; + } + *file << typeName << ";\n"; break; } } - *file << " " << typeName << ";\n"; - writeVersionGuardEnd(file, info); *file << "\n"; } @@ -196,8 +182,7 @@ static void writeTypeComment(GeneratedFile* file, const Type& type) { static void writeFunctionPermutation(GeneratedFile* file, const FunctionSpecification& spec, const FunctionPermutation& permutation) { - Function* function = spec.getFunction(); - writeVersionGuardStart(file, spec.getVersionInfo(), function->getFinalVersion()); + writeVersionGuardStart(file, spec.getVersionInfo()); // Write linkage info. const auto inlineCodeLines = permutation.getInline(); @@ -215,9 +200,20 @@ static void writeFunctionPermutation(GeneratedFile* file, const FunctionSpecific *file << "void"; } - *file << makeAttributeTag(spec.getAttribute(), "overloadable", - function->getDeprecatedApiLevel(), function->getDeprecatedMessage()); - *file << "\n"; + // Write the attribute. + *file << " __attribute__(("; + const string attrib = spec.getAttribute(); + if (attrib.empty()) { + *file << "overloadable"; + } else if (attrib[0] == '=') { + /* If starts with an equal, we don't automatically add overloadable. + * This is because of the error we made defining rsUnpackColor8888(). + */ + *file << attrib.substr(1); + } else { + *file << attrib << ", overloadable"; + } + *file << "))\n"; // Write the function name. *file << " " << permutation.getName() << "("; diff --git a/api/Specification.cpp b/api/Specification.cpp index 7634eab4..09a0663d 100644 --- a/api/Specification.cpp +++ b/api/Specification.cpp @@ -224,20 +224,7 @@ bool VersionInfo::scan(Scanner* scanner, int maxApiLevel) { return minVersion == 0 || minVersion <= maxApiLevel; } -Definition::Definition(const std::string& name) - : mName(name), mDeprecatedApiLevel(0), mHidden(false), mFinalVersion(-1) { -} - -void Definition::updateFinalVersion(const VersionInfo& info) { - /* We set it if: - * - We have never set mFinalVersion before, or - * - The max version is 0, which means we have not expired this API, or - * - We have a max that's later than what we currently have. - */ - if (mFinalVersion < 0 || info.maxVersion == 0 || - (mFinalVersion > 0 && info.maxVersion > mFinalVersion)) { - mFinalVersion = info.maxVersion; - } +Definition::Definition(const std::string& name) : mName(name), mDeprecated(false), mHidden(false) { } void Definition::scanDocumentationTags(Scanner* scanner, bool firstOccurence, @@ -247,16 +234,8 @@ void Definition::scanDocumentationTags(Scanner* scanner, bool firstOccurence, mHidden = true; } if (scanner->findOptionalTag("deprecated:")) { - string value = scanner->getValue(); - size_t pComma = value.find(", "); - if (pComma != string::npos) { - mDeprecatedMessage = value.substr(pComma + 2); - value.erase(pComma); - } - sscanf(value.c_str(), "%i", &mDeprecatedApiLevel); - if (mDeprecatedApiLevel <= 0) { - scanner->error() << "deprecated entries should have a level > 0\n"; - } + mDeprecated = true; + mDeprecatedMessage = scanner->getValue(); } if (firstOccurence) { if (scanner->findTag("summary:")) { @@ -344,7 +323,6 @@ void ConstantSpecification::scanConstantSpecification(Scanner* scanner, SpecFile Constant* constant = systemSpecification.findOrCreateConstant(name, &created); ConstantSpecification* spec = new ConstantSpecification(constant); constant->addSpecification(spec); - constant->updateFinalVersion(info); specFile->addConstantSpecification(spec, created); spec->mVersionInfo = info; @@ -370,7 +348,6 @@ void TypeSpecification::scanTypeSpecification(Scanner* scanner, SpecFile* specFi Type* type = systemSpecification.findOrCreateType(name, &created); TypeSpecification* spec = new TypeSpecification(type); type->addSpecification(spec); - type->updateFinalVersion(info); specFile->addTypeSpecification(spec, created); spec->mVersionInfo = info; @@ -388,6 +365,9 @@ void TypeSpecification::scanTypeSpecification(Scanner* scanner, SpecFile* specFi spec->mFields.push_back(s); spec->mFieldComments.push_back(comment); } + if (scanner->findOptionalTag("attrib:")) { + spec->mAttrib = scanner->getValue(); + } } if (scanner->findOptionalTag("enum:")) { spec->mKind = ENUM; @@ -400,9 +380,6 @@ void TypeSpecification::scanTypeSpecification(Scanner* scanner, SpecFile* specFi spec->mValueComments.push_back(comment); } } - if (scanner->findOptionalTag("attrib:")) { - spec->mAttribute = scanner->getValue(); - } type->scanDocumentationTags(scanner, created, specFile); scanner->findTag("end:"); @@ -552,7 +529,6 @@ void FunctionSpecification::scanFunctionSpecification(Scanner* scanner, SpecFile Function* function = systemSpecification.findOrCreateFunction(name, &created); FunctionSpecification* spec = new FunctionSpecification(function); function->addSpecification(spec); - function->updateFinalVersion(info); specFile->addFunctionSpecification(spec, created); spec->mUnexpandedName = unexpandedName; diff --git a/api/Specification.h b/api/Specification.h index 1ec69733..e808e600 100644 --- a/api/Specification.h +++ b/api/Specification.h @@ -141,33 +141,25 @@ struct VersionInfo { class Definition { protected: std::string mName; - /* If greater than 0, this definition is deprecated. It's the API level at which - * we added the deprecation warning. - */ - int mDeprecatedApiLevel; + bool mDeprecated; // True if this API should not be used std::string mDeprecatedMessage; // Optional specific warning if the API is deprecated bool mHidden; // True if it should not be documented std::string mSummary; // A one-line description std::vector<std::string> mDescription; // The comments to be included in the header std::string mUrl; // The URL of the detailed documentation - int mFinalVersion; // API level at which this API was removed, 0 if API is still valid public: Definition(const std::string& name); std::string getName() const { return mName; } - bool deprecated() const { return mDeprecatedApiLevel > 0; } - int getDeprecatedApiLevel() const { return mDeprecatedApiLevel; } + bool deprecated() const { return mDeprecated; } std::string getDeprecatedMessage() const { return mDeprecatedMessage; } bool hidden() const { return mHidden; } std::string getSummary() const { return mSummary; } const std::vector<std::string>& getDescription() const { return mDescription; } std::string getUrl() const { return mUrl; } - int getFinalVersion() const { return mFinalVersion; } void scanDocumentationTags(Scanner* scanner, bool firstOccurence, const SpecFile* specFile); - // Keep track of the final version of this API, if any. - void updateFinalVersion(const VersionInfo& info); }; /* Represents a constant, like M_PI. This is a grouping of the version specific specifications. @@ -286,7 +278,7 @@ private: std::string mStructName; // The name found after the struct keyword std::vector<std::string> mFields; // One entry per struct field std::vector<std::string> mFieldComments; // One entry per struct field - std::string mAttribute; // Some structures may have attributes + std::string mAttrib; // Some structures may have attributes // If mKind is ENUM: std::string mEnumName; // The name found after the enum keyword @@ -301,7 +293,7 @@ public: std::string getStructName() const { return mStructName; } const std::vector<std::string>& getFields() const { return mFields; } const std::vector<std::string>& getFieldComments() const { return mFieldComments; } - std::string getAttribute() const { return mAttribute; } + std::string getAttrib() const { return mAttrib; } std::string getEnumName() const { return mEnumName; } const std::vector<std::string>& getValues() const { return mValues; } const std::vector<std::string>& getValueComments() const { return mValueComments; } @@ -376,7 +368,7 @@ public: FunctionSpecification(Function* function) : mFunction(function), mReturn(nullptr) {} ~FunctionSpecification(); - Function* getFunction() const { return mFunction; } + Function* getFunction() { return mFunction; } std::string getAttribute() const { return mAttribute; } std::string getTest() const { return mTest; } std::string getPrecisionLimit() const { return mPrecisionLimit; } diff --git a/api/Utilities.cpp b/api/Utilities.cpp index 42682787..311d7c69 100644 --- a/api/Utilities.cpp +++ b/api/Utilities.cpp @@ -14,7 +14,6 @@ * limitations under the License. */ -#include <algorithm> #include <iostream> #include <sstream> @@ -150,48 +149,6 @@ double maxDoubleForInteger(int numberOfIntegerBits, int mantissaSize) { return (double)l; } -// Add the value to the stream, prefixed with a ", " if needed. -static void addCommaSeparated(const string& value, ostringstream* stream, bool* needComma) { - if (value.empty()) { - return; - } - if (*needComma) { - *stream << ", "; - } - *stream << value; - *needComma = true; -} - -string makeAttributeTag(const string& userAttribute, const string& additionalAttribute, - int deprecatedApiLevel, const string& deprecatedMessage) { - ostringstream stream; - bool needComma = false; - if (userAttribute[0] == '=') { - /* If starts with an equal, we don't automatically add additionalAttribute. - * This is because of the error we made defining rsUnpackColor8888(). - */ - addCommaSeparated(userAttribute.substr(1), &stream, &needComma); - } else { - addCommaSeparated(userAttribute, &stream, &needComma); - addCommaSeparated(additionalAttribute, &stream, &needComma); - } - if (deprecatedApiLevel > 0) { - stream << "\n#if (defined(RS_VERSION) && (RS_VERSION >= " << deprecatedApiLevel << "))\n"; - addCommaSeparated("deprecated", &stream, &needComma); - if (!deprecatedMessage.empty()) { - // Remove any @ that's used for generating documentation cross references. - string s = deprecatedMessage; - s.erase(std::remove(s.begin(), s.end(), '@'), s.end()); - stream << "(\"" << s << "\")"; - } - stream << "\n#endif\n"; - } - if (stream.tellp() == 0) { - return ""; - } - return " __attribute__((" + stream.str() + "))"; -} - // Opens the stream. Reports an error if it can't. bool GeneratedFile::start(const string& directory, const string& name) { const string path = directory + "/" + name; diff --git a/api/Utilities.h b/api/Utilities.h index cd0db728..04169dc3 100644 --- a/api/Utilities.h +++ b/api/Utilities.h @@ -47,13 +47,6 @@ bool testAndSet(const std::string& flag, std::set<std::string>* set); */ double maxDoubleForInteger(int numberOfIntegerBits, int mantissaSize); -/* Creates an " __attribute__((...))" tag. If userAttribute starts with '=', we don't - * use the additionalAttribute. An empty string will be returned if there are no attributes. - */ -std::string makeAttributeTag(const std::string& userAttribute, - const std::string& additionalAttribute, int deprecatedApiLevel, - const std::string& deprecatedMessage); - /* This class is used to generate one source file. There will be one instance * for each generated file. */ diff --git a/api/rs_convert.spec b/api/rs_convert.spec index fbc2cf3d..ed531992 100644 --- a/api/rs_convert.spec +++ b/api/rs_convert.spec @@ -81,13 +81,9 @@ arg: float g, "Green component." arg: float b, "Blue component." summary: Create a uchar4 RGBA from floats description: - Packs three or four floating point RGBA values into a uchar4. - - The input values are typically between 0.0 and 1.0 inclusive. For input values outside - of this range, the resulting outputs will be clamped to be between 0 and 255. As this - clamping may be done after the input is multiplied by 255.f and converted to an integer, - input numbers greater than INT_MAX/255.f or less than INT_MIN/255.f can result in - undefined behavior. + Packs three or four floating point RGBA values into a uchar4. The RGBA values should be + between 0.0 and 1.0 inclusive. Values outside of this range are clamped to this range. + However numbers greater than INT_MAX or less than INT_MIN can result in undefined behavior. If the alpha component is not specified, it is assumed to be 1.0, i.e. the result will have an alpha set to 255. diff --git a/api/rs_for_each.spec b/api/rs_for_each.spec index 9206d021..5d513161 100644 --- a/api/rs_for_each.spec +++ b/api/rs_for_each.spec @@ -109,8 +109,8 @@ description: This can be done by defining an rs_allocation variable and not initializing it. E.g.<code><br/> rs_script gCustomScript;<br/> void specializedProcessing(rs_allocation in) {<br/> - rs_allocation ignoredOut;<br/> - rsForEach(gCustomScript, in, ignoredOut);<br/> + rs_allocation ignoredOut;<br/> + rsForEach(gCustomScript, in, ignoredOut);<br/> }<br/></code> If both input and output allocations are specified, they must have the same dimensions. diff --git a/api/rs_graphics.spec b/api/rs_graphics.spec index af41a286..4f9d9712 100644 --- a/api/rs_graphics.spec +++ b/api/rs_graphics.spec @@ -17,7 +17,7 @@ header: summary: Graphics Functions and Types description: - The graphics subsystem of RenderScript was removed at API level 23. + The graphics subsystem of RenderScript has been deprecated. include: #ifdef __LP64__ // TODO We need to fix some of the builds before enabling this error: @@ -29,7 +29,7 @@ include: end: type: rs_blend_src_func -version: 16 22 +version: 16 size: 32 enum: value: RS_BLEND_SRC_ZERO = 0 @@ -42,13 +42,13 @@ value: RS_BLEND_SRC_DST_ALPHA = 6 value: RS_BLEND_SRC_ONE_MINUS_DST_ALPHA = 7 value: RS_BLEND_SRC_SRC_ALPHA_SATURATE = 8 value: RS_BLEND_SRC_INVALID = 100 -deprecated: 22 +deprecated: summary: Blend source function description: end: type: rs_blend_dst_func -version: 16 22 +version: 16 size: 32 enum: value: RS_BLEND_DST_ZERO = 0 @@ -60,26 +60,26 @@ value: RS_BLEND_DST_ONE_MINUS_SRC_ALPHA = 5 value: RS_BLEND_DST_DST_ALPHA = 6 value: RS_BLEND_DST_ONE_MINUS_DST_ALPHA = 7 value: RS_BLEND_DST_INVALID = 100 -deprecated: 22 +deprecated: summary: Blend destination function description: end: type: rs_cull_mode -version: 16 22 +version: 16 size: 32 enum: value: RS_CULL_BACK = 0 value: RS_CULL_FRONT = 1 value: RS_CULL_NONE = 2 value: RS_CULL_INVALID = 100 -deprecated: 22 +deprecated: summary: Culling mode description: end: type: rs_depth_func -version: 16 22 +version: 16 size: 32 enum: value: RS_DEPTH_FUNC_ALWAYS = 0, "Always drawn" @@ -90,7 +90,7 @@ value: RS_DEPTH_FUNC_GEQUAL = 4, "Drawn if the incoming depth value is greater o value: RS_DEPTH_FUNC_EQUAL = 5, "Drawn if the incoming depth value is equal to that in the depth buffer" value: RS_DEPTH_FUNC_NOTEQUAL = 6, "Drawn if the incoming depth value is not equal to that in the depth buffer" value: RS_DEPTH_FUNC_INVALID = 100, "Invalid depth function" -deprecated: 22 +deprecated: summary: Depth function description: Specifies conditional drawing depending on the comparison of the incoming @@ -98,7 +98,7 @@ description: end: type: rs_primitive -version: 16 22 +version: 16 size: 32 enum: value: RS_PRIMITIVE_POINT = 0, "Vertex data will be rendered as a series of points" @@ -108,17 +108,16 @@ value: RS_PRIMITIVE_TRIANGLE = 3, "Vertices will be rendered as individual trian value: RS_PRIMITIVE_TRIANGLE_STRIP = 4, "Vertices will be rendered as a connected triangle strip defined by the first three vertices with each additional triangle defined by a new vertex" value: RS_PRIMITIVE_TRIANGLE_FAN = 5, "Vertices will be rendered as a sequence of triangles that all share first vertex as the origin" value: RS_PRIMITIVE_INVALID = 100, "Invalid primitive" -deprecated: 22 +deprecated: summary: How to intepret mesh vertex data description: Describes the way mesh vertex data is interpreted when rendering end: type: rs_font -version: 9 22 size: 32 simple: _RS_HANDLE -deprecated: 22 +deprecated: summary: Handle to a Font description: Opaque handle to a RenderScript font object. @@ -127,10 +126,9 @@ end: type: rs_mesh -version: 9 22 size: 32 simple: _RS_HANDLE -deprecated: 22 +deprecated: summary: Handle to a Mesh description: Opaque handle to a RenderScript mesh object. @@ -138,10 +136,9 @@ description: end: type: rs_program_fragment -version: 9 22 size: 32 simple: _RS_HANDLE -deprecated: 22 +deprecated: summary: Handle to a ProgramFragment description: Opaque handle to a RenderScript ProgramFragment object. @@ -149,10 +146,9 @@ description: end: type: rs_program_vertex -version: 9 22 size: 32 simple: _RS_HANDLE -deprecated: 22 +deprecated: summary: Handle to a ProgramVertex description: Opaque handle to a RenderScript ProgramVertex object. @@ -160,10 +156,9 @@ description: end: type: rs_program_raster -version: 9 22 size: 32 simple: _RS_HANDLE -deprecated: 22 +deprecated: summary: Handle to a ProgramRaster description: Opaque handle to a RenderScript ProgramRaster object. @@ -171,10 +166,9 @@ description: end: type: rs_program_store -version: 9 22 size: 32 simple: _RS_HANDLE -deprecated: 22 +deprecated: summary: Handle to a ProgramStore description: Opaque handle to a RenderScript ProgramStore object. @@ -182,7 +176,6 @@ description: end: function: rsClearObject -version: 9 22 size: 32 t: rs_mesh, rs_program_fragment, rs_program_vertex, rs_program_raster, rs_program_store, rs_font ret: void @@ -191,7 +184,6 @@ test: none end: function: rsIsObject -version: 9 22 size: 32 t: rs_mesh, rs_program_fragment, rs_program_vertex, rs_program_raster, rs_program_store, rs_font ret: bool @@ -200,7 +192,6 @@ test: none end: function: rsSetObject -version: 9 22 size: 32 t: rs_mesh, rs_program_fragment, rs_program_vertex, rs_program_raster, rs_program_store, rs_font ret: void @@ -210,11 +201,10 @@ test: none end: function: rsgAllocationSyncAll -version: 9 22 size: 32 ret: void arg: rs_allocation alloc -deprecated: 22 +deprecated: summary: Sync the contents of an allocation description: Sync the contents of an allocation. @@ -227,7 +217,7 @@ test: none end: function: rsgAllocationSyncAll -version: 14 22 +version: 14 size: 32 ret: void arg: rs_allocation alloc @@ -236,12 +226,12 @@ test: none end: function: rsgBindColorTarget -version: 14 22 +version: 14 size: 32 ret: void arg: rs_allocation colorTarget arg: uint slot -deprecated: 22 +deprecated: summary: Set the color target description: Set the color target used for all subsequent rendering calls @@ -249,13 +239,12 @@ test: none end: function: rsgBindConstant -version: 9 22 size: 32 ret: void arg: rs_program_fragment ps, "program fragment object" arg: uint slot, "index of the constant buffer on the program" arg: rs_allocation c, "constants to bind" -deprecated: 22 +deprecated: summary: Bind a constant allocation description: Bind a new Allocation object to a ProgramFragment or ProgramVertex. @@ -264,7 +253,6 @@ test: none end: function: rsgBindConstant -version: 9 22 size: 32 ret: void arg: rs_program_vertex pv, "program vertex object" @@ -274,11 +262,11 @@ test: none end: function: rsgBindDepthTarget -version: 14 22 +version: 14 size: 32 ret: void arg: rs_allocation depthTarget -deprecated: 22 +deprecated: summary: Set the depth target description: Set the depth target used for all subsequent rendering calls @@ -286,11 +274,10 @@ test: none end: function: rsgBindFont -version: 9 22 size: 32 ret: void arg: rs_font font, "object to bind" -deprecated: 22 +deprecated: summary: Bind a font object description: Binds the font object to be used for all subsequent font rendering calls @@ -298,11 +285,10 @@ test: none end: function: rsgBindProgramFragment -version: 9 22 size: 32 ret: void arg: rs_program_fragment pf -deprecated: 22 +deprecated: summary: Bind a ProgramFragment description: Bind a new ProgramFragment to the rendering context. @@ -310,11 +296,10 @@ test: none end: function: rsgBindProgramRaster -version: 9 22 size: 32 ret: void arg: rs_program_raster pr -deprecated: 22 +deprecated: summary: Bind a ProgramRaster description: Bind a new ProgramRaster to the rendering context. @@ -322,11 +307,10 @@ test: none end: function: rsgBindProgramStore -version: 9 22 size: 32 ret: void arg: rs_program_store ps -deprecated: 22 +deprecated: summary: Bind a ProgramStore description: Bind a new ProgramStore to the rendering context. @@ -334,11 +318,10 @@ test: none end: function: rsgBindProgramVertex -version: 9 22 size: 32 ret: void arg: rs_program_vertex pv -deprecated: 22 +deprecated: summary: Bind a ProgramVertex description: Bind a new ProgramVertex to the rendering context. @@ -346,13 +329,12 @@ test: none end: function: rsgBindSampler -version: 9 22 size: 32 ret: void arg: rs_program_fragment fragment arg: uint slot arg: rs_sampler sampler -deprecated: 22 +deprecated: summary: Bind a sampler description: Bind a new Sampler object to a ProgramFragment. The sampler will @@ -361,13 +343,12 @@ test: none end: function: rsgBindTexture -version: 9 22 size: 32 ret: void arg: rs_program_fragment v arg: uint slot arg: rs_allocation alloc -deprecated: 22 +deprecated: summary: Bind a texture allocation description: Bind a new Allocation object to a ProgramFragment. The @@ -378,10 +359,10 @@ test: none end: function: rsgClearAllRenderTargets -version: 14 22 +version: 14 size: 32 ret: void -deprecated: 22 +deprecated: summary: Clear all color and depth targets description: Clear all color and depth targets and resume rendering into @@ -390,14 +371,13 @@ test: none end: function: rsgClearColor -version: 9 22 size: 32 ret: void arg: float r arg: float g arg: float b arg: float a -deprecated: 22 +deprecated: summary: Clear the specified color from the surface description: Clears the rendering surface to the specified color. @@ -405,11 +385,11 @@ test: none end: function: rsgClearColorTarget -version: 14 22 +version: 14 size: 32 ret: void arg: uint slot -deprecated: 22 +deprecated: summary: Clear the color target description: Clear the previously set color target @@ -417,11 +397,10 @@ test: none end: function: rsgClearDepth -version: 9 22 size: 32 ret: void arg: float value -deprecated: 22 +deprecated: summary: Clear the depth surface description: Clears the depth suface to the specified value. @@ -429,10 +408,10 @@ test: none end: function: rsgClearDepthTarget -version: 14 22 +version: 14 size: 32 ret: void -deprecated: 22 +deprecated: summary: Clear the depth target description: Clear the previously set depth target @@ -440,11 +419,10 @@ test: none end: function: rsgDrawMesh -version: 9 22 size: 32 ret: void arg: rs_mesh ism, "mesh object to render" -deprecated: 22 +deprecated: summary: Draw a mesh description: Draw a mesh using the current context state. @@ -458,7 +436,6 @@ test: none end: function: rsgDrawMesh -version: 9 22 size: 32 ret: void arg: rs_mesh ism @@ -467,7 +444,6 @@ test: none end: function: rsgDrawMesh -version: 9 22 size: 32 ret: void arg: rs_mesh ism @@ -478,7 +454,6 @@ test: none end: function: rsgDrawQuad -version: 9 22 size: 32 ret: void arg: float x1 @@ -493,7 +468,7 @@ arg: float z3 arg: float x4 arg: float y4 arg: float z4 -deprecated: 22 +deprecated: summary: Draw a quad description: Low performance utility function for drawing a simple quad. Not intended for @@ -502,7 +477,6 @@ test: none end: function: rsgDrawQuadTexCoords -version: 9 22 size: 32 ret: void arg: float x1 @@ -525,7 +499,7 @@ arg: float y4 arg: float z4 arg: float u4 arg: float v4 -deprecated: 22 +deprecated: summary: Draw a textured quad description: Low performance utility function for drawing a textured quad. Not intended @@ -534,7 +508,6 @@ test: none end: function: rsgDrawRect -version: 9 22 size: 32 ret: void arg: float x1 @@ -542,7 +515,7 @@ arg: float y1 arg: float x2 arg: float y2 arg: float z -deprecated: 22 +deprecated: summary: Draw a rectangle description: Low performance utility function for drawing a simple rectangle. Not @@ -551,7 +524,6 @@ test: none end: function: rsgDrawSpriteScreenspace -version: 9 22 size: 32 ret: void arg: float x @@ -559,7 +531,7 @@ arg: float y arg: float z arg: float w arg: float h -deprecated: 22 +deprecated: summary: Draw rectangles in screenspace description: Low performance function for drawing rectangles in screenspace. This @@ -570,13 +542,12 @@ test: none end: function: rsgDrawText -version: 9 22 size: 32 ret: void arg: const char* text arg: int x arg: int y -deprecated: 22 +deprecated: summary: Draw a text string description: Draws text given a string and location @@ -584,7 +555,6 @@ test: none end: function: rsgDrawText -version: 9 22 size: 32 ret: void arg: rs_allocation alloc @@ -594,10 +564,10 @@ test: none end: function: rsgFinish -version: 14 22 +version: 14 size: 32 ret: uint -deprecated: 22 +deprecated: summary: End rendering commands description: Force RenderScript to finish all rendering commands @@ -605,14 +575,13 @@ test: none end: function: rsgFontColor -version: 9 22 size: 32 ret: void arg: float r, "red component" arg: float g, "green component" arg: float b, "blue component" arg: float a, "alpha component" -deprecated: 22 +deprecated: summary: Set the font color description: Sets the font color for all subsequent rendering calls @@ -620,10 +589,9 @@ test: none end: function: rsgGetHeight -version: 9 22 size: 32 ret: uint -deprecated: 22 +deprecated: summary: Get the surface height description: Get the height of the current rendering surface. @@ -631,10 +599,9 @@ test: none end: function: rsgGetWidth -version: 9 22 size: 32 ret: uint -deprecated: 22 +deprecated: summary: Get the surface width description: Get the width of the current rendering surface. @@ -642,7 +609,6 @@ test: none end: function: rsgMeasureText -version: 9 22 size: 32 ret: void arg: const char* text @@ -650,7 +616,7 @@ arg: int* left arg: int* right arg: int* top arg: int* bottom -deprecated: 22 +deprecated: summary: Get the bounding box for a text string description: Returns the bounding box of the text relative to (0, 0) @@ -659,7 +625,6 @@ test: none end: function: rsgMeasureText -version: 9 22 size: 32 ret: void arg: rs_allocation alloc @@ -671,7 +636,6 @@ test: none end: function: rsgMeshComputeBoundingBox -version: 9 22 size: 32 ret: void arg: rs_mesh mesh @@ -681,7 +645,7 @@ arg: float* min arg: float* maxX arg: float* maxY arg: float* maxZ -deprecated: 22 +deprecated: summary: Compute a bounding box description: Computes an axis aligned bounding box of a mesh object @@ -689,7 +653,6 @@ test: none end: function: rsgMeshComputeBoundingBox -version: 9 22 size: 32 attrib: always_inline ret: void @@ -709,12 +672,12 @@ test: none end: function: rsgMeshGetIndexAllocation -version: 16 22 +version: 16 size: 32 ret: rs_allocation, "allocation containing index data" arg: rs_mesh m, "mesh to get data from" arg: uint32_t index, "index of the index allocation" -deprecated: 22 +deprecated: summary: Return an allocation containing index data description: Returns an allocation containing index data or a null @@ -723,12 +686,12 @@ test: none end: function: rsgMeshGetPrimitive -version: 16 22 +version: 16 size: 32 ret: rs_primitive, "primitive describing how the mesh is rendered" arg: rs_mesh m, "mesh to get data from" arg: uint32_t index, "index of the primitive" -deprecated: 22 +deprecated: summary: Return the primitive description: Returns the primitive describing how a part of the mesh is @@ -737,11 +700,11 @@ test: none end: function: rsgMeshGetPrimitiveCount -version: 16 22 +version: 16 size: 32 ret: uint32_t, "number of primitive groups in the mesh. This would include simple primitives as well as allocations containing index data" arg: rs_mesh m, "mesh to get data from" -deprecated: 22 +deprecated: summary: Return the number of index sets description: Meshes could have multiple index sets, this function returns @@ -750,12 +713,12 @@ test: none end: function: rsgMeshGetVertexAllocation -version: 16 22 +version: 16 size: 32 ret: rs_allocation, "allocation containing vertex data" arg: rs_mesh m, "mesh to get data from" arg: uint32_t index, "index of the vertex allocation" -deprecated: 22 +deprecated: summary: Return a vertex allocation description: Returns an allocation that is part of the mesh and contains @@ -764,11 +727,11 @@ test: none end: function: rsgMeshGetVertexAllocationCount -version: 16 22 +version: 16 size: 32 ret: uint32_t, "number of allocations in the mesh that contain vertex data" arg: rs_mesh m, "mesh to get data from" -deprecated: 22 +deprecated: summary: Return the number of vertex allocations description: Returns the number of allocations in the mesh that contain @@ -777,7 +740,6 @@ test: none end: function: rsgProgramFragmentConstantColor -version: 9 22 size: 32 ret: void arg: rs_program_fragment pf @@ -785,7 +747,7 @@ arg: float r arg: float g arg: float b arg: float a -deprecated: 22 +deprecated: summary: Set the constant color for a fixed function emulation program description: Set the constant color for a fixed function emulation program. @@ -793,11 +755,10 @@ test: none end: function: rsgProgramVertexGetProjectionMatrix -version: 9 22 size: 32 ret: void arg: rs_matrix4x4* proj, "matrix to store the current projection matrix into" -deprecated: 22 +deprecated: summary: Get the projection matrix for a fixed function vertex program description: Get the projection matrix for a currently bound fixed function @@ -807,11 +768,10 @@ test: none end: function: rsgProgramVertexLoadModelMatrix -version: 9 22 size: 32 ret: void arg: const rs_matrix4x4* model, "model matrix" -deprecated: 22 +deprecated: summary: Load the model matrix for a bound fixed function vertex program description: Load the model matrix for a currently bound fixed function @@ -821,11 +781,10 @@ test: none end: function: rsgProgramVertexLoadProjectionMatrix -version: 9 22 size: 32 ret: void arg: const rs_matrix4x4* proj, "projection matrix" -deprecated: 22 +deprecated: summary: Load the projection matrix for a bound fixed function vertex program description: Load the projection matrix for a currently bound fixed function @@ -835,11 +794,10 @@ test: none end: function: rsgProgramVertexLoadTextureMatrix -version: 9 22 size: 32 ret: void arg: const rs_matrix4x4* tex, "texture matrix" -deprecated: 22 +deprecated: summary: Load the texture matrix for a bound fixed function vertex program description: Load the texture matrix for a currently bound fixed function @@ -849,11 +807,11 @@ test: none end: function: rsgProgramRasterGetCullMode -version: 16 22 +version: 16 size: 32 ret: rs_cull_mode arg: rs_program_raster pr, "program raster to query" -deprecated: 22 +deprecated: summary: Get program raster cull mode description: Get program raster cull mode @@ -861,11 +819,11 @@ test: none end: function: rsgProgramRasterIsPointSpriteEnabled -version: 16 22 +version: 16 size: 32 ret: bool arg: rs_program_raster pr, "program raster to query" -deprecated: 22 +deprecated: summary: Get program raster point sprite state description: Get program raster point sprite state @@ -873,11 +831,11 @@ test: none end: function: rsgProgramStoreGetBlendDstFunc -version: 16 22 +version: 16 size: 32 ret: rs_blend_dst_func arg: rs_program_store ps, "program store to query" -deprecated: 22 +deprecated: summary: Get program store blend destination function description: Get program store blend destination function @@ -885,11 +843,11 @@ test: none end: function: rsgProgramStoreGetBlendSrcFunc -version: 16 22 +version: 16 size: 32 ret: rs_blend_src_func arg: rs_program_store ps, "program store to query" -deprecated: 22 +deprecated: summary: Get program store blend source function description: Get program store blend source function @@ -897,11 +855,11 @@ test: none end: function: rsgProgramStoreGetDepthFunc -version: 16 22 +version: 16 size: 32 ret: rs_depth_func arg: rs_program_store ps, "program store to query" -deprecated: 22 +deprecated: summary: Get program store depth function description: Get program store depth function @@ -909,11 +867,11 @@ test: none end: function: rsgProgramStoreIsColorMaskAlphaEnabled -version: 16 22 +version: 16 size: 32 ret: bool arg: rs_program_store ps, "program store to query" -deprecated: 22 +deprecated: summary: Get program store alpha component color mask description: Get program store alpha component color mask @@ -921,11 +879,11 @@ test: none end: function: rsgProgramStoreIsColorMaskBlueEnabled -version: 16 22 +version: 16 size: 32 ret: bool arg: rs_program_store ps, "program store to query" -deprecated: 22 +deprecated: summary: Get program store blur component color mask description: Get program store blur component color mask @@ -933,11 +891,11 @@ test: none end: function: rsgProgramStoreIsColorMaskGreenEnabled -version: 16 22 +version: 16 size: 32 ret: bool arg: rs_program_store ps, "program store to query" -deprecated: 22 +deprecated: summary: Get program store green component color mask description: Get program store green component color mask @@ -945,11 +903,11 @@ test: none end: function: rsgProgramStoreIsColorMaskRedEnabled -version: 16 22 +version: 16 size: 32 ret: bool arg: rs_program_store ps, "program store to query" -deprecated: 22 +deprecated: summary: Get program store red component color mask description: Get program store red component color mask @@ -957,11 +915,11 @@ test: none end: function: rsgProgramStoreIsDepthMaskEnabled -version: 16 22 +version: 16 size: 32 ret: bool arg: rs_program_store ps, "program store to query" -deprecated: 22 +deprecated: summary: Get program store depth mask description: Get program store depth mask @@ -969,11 +927,11 @@ test: none end: function: rsgProgramStoreIsDitherEnabled -version: 16 22 +version: 16 size: 32 ret: bool arg: rs_program_store ps, "program store to query" -deprecated: 22 +deprecated: summary: Get program store dither state description: Get program store dither state diff --git a/api/rs_math.spec b/api/rs_math.spec index 6e7daf69..cdd71230 100644 --- a/api/rs_math.spec +++ b/api/rs_math.spec @@ -65,7 +65,7 @@ end: constant: M_2_PIl value: 0.636619772367581343075535053490057448f hidden: -deprecated: 22, Use M_2_PI instead. +deprecated: Use M_2_PI instead. summary: 2 / pi, as a 32 bit float description: 2 divided by pi, as a 32 bit float. @@ -2179,7 +2179,7 @@ ret: #1 arg: #1 amount, "Value to clamp." arg: #1 low, "Lower bound." arg: #1 high, "Upper bound." -deprecated: 22, Use @clamp() instead. +deprecated: Use @clamp() instead. summary: Restrain a value to a range description: Clamp a value between low and high. @@ -2190,7 +2190,7 @@ function: rsFrac attrib: const ret: float arg: float v -deprecated: 22, Use @fract() instead. +deprecated: Use @fract() instead. summary: Returns the fractional part of a float description: Returns the fractional part of a float diff --git a/api/rs_object_info.spec b/api/rs_object_info.spec index 6a6336da..cf9b56be 100644 --- a/api/rs_object_info.spec +++ b/api/rs_object_info.spec @@ -299,7 +299,7 @@ end: function: rsGetAllocation ret: rs_allocation arg: const void* p -deprecated: 22, This function is deprecated and will be removed from the SDK in a future release. +deprecated: This function is deprecated and will be removed from the SDK in a future release. summary: Return the Allocation for a given pointer description: Returns the Allocation for a given pointer. The pointer should point within a valid diff --git a/api/rs_value_types.spec b/api/rs_value_types.spec index ef1ce4fc..d559157a 100644 --- a/api/rs_value_types.spec +++ b/api/rs_value_types.spec @@ -245,8 +245,7 @@ simple: int32_t end: type: float2 -simple: float -attrib: ext_vector_type(2) +simple: float __attribute__((ext_vector_type(2))) summary: Two 32 bit floats description: A vector of two floats. These two floats are packed into a single 64 bit field @@ -257,8 +256,7 @@ description: end: type: float3 -simple: float -attrib: ext_vector_type(3) +simple: float __attribute__((ext_vector_type(3))) summary: Three 32 bit floats description: A vector of three floats. These three floats are packed into a single 128 bit field @@ -266,8 +264,7 @@ description: end: type: float4 -simple: float -attrib: ext_vector_type(4) +simple: float __attribute__((ext_vector_type(4))) summary: Four 32 bit floats description: A vector of four floats type. These four floats are packed into a single 128 bit field @@ -276,8 +273,7 @@ end: type: double2 -simple: double -attrib: ext_vector_type(2) +simple: double __attribute__((ext_vector_type(2))) summary: Two 64 bit floats description: A vector of two doubles. These two double fields packed into a single 128 bit field @@ -285,8 +281,7 @@ description: end: type: double3 -simple: double -attrib: ext_vector_type(3) +simple: double __attribute__((ext_vector_type(3))) summary: Three 64 bit floats description: A vector of three doubles. These three double fields packed into a single 256 bit field @@ -294,8 +289,7 @@ description: end: type: double4 -simple: double -attrib: ext_vector_type(4) +simple: double __attribute__((ext_vector_type(4))) summary: Four 64 bit floats description: A vector of four doubles. These four double fields packed into a single 256 bit field @@ -304,8 +298,7 @@ end: type: uchar2 -simple: uchar -attrib: ext_vector_type(2) +simple: uchar __attribute__((ext_vector_type(2))) summary: Two 8 bit unsigned integers description: A vector of two uchars. These two uchar fields packed into a single 16 bit field @@ -313,8 +306,7 @@ description: end: type: uchar3 -simple: uchar -attrib: ext_vector_type(3) +simple: uchar __attribute__((ext_vector_type(3))) summary: Three 8 bit unsigned integers description: A vector of three uchars. These three uchar fields packed into a single 32 bit field @@ -322,8 +314,7 @@ description: end: type: uchar4 -simple: uchar -attrib: ext_vector_type(4) +simple: uchar __attribute__((ext_vector_type(4))) summary: Four 8 bit unsigned integers description: A vector of four uchars. These four uchar fields packed into a single 32 bit field @@ -332,8 +323,7 @@ end: type: ushort2 -simple: ushort -attrib: ext_vector_type(2) +simple: ushort __attribute__((ext_vector_type(2))) summary: Two 16 bit unsigned integers description: A vector of two ushorts. These two ushort fields packed into a single 32 bit field @@ -341,8 +331,7 @@ description: end: type: ushort3 -simple: ushort -attrib: ext_vector_type(3) +simple: ushort __attribute__((ext_vector_type(3))) summary: Three 16 bit unsigned integers description: A vector of three ushorts. These three ushort fields packed into a single 64 bit field @@ -350,8 +339,7 @@ description: end: type: ushort4 -simple: ushort -attrib: ext_vector_type(4) +simple: ushort __attribute__((ext_vector_type(4))) summary: Four 16 bit unsigned integers description: A vector of four ushorts. These four ushort fields packed into a single 64 bit field @@ -360,8 +348,7 @@ end: type: uint2 -simple: uint -attrib: ext_vector_type(2) +simple: uint __attribute__((ext_vector_type(2))) summary: Two 32 bit unsigned integers description: A vector of two uints. These two uints are packed into a single 64 bit field @@ -369,8 +356,7 @@ description: end: type: uint3 -simple: uint -attrib: ext_vector_type(3) +simple: uint __attribute__((ext_vector_type(3))) summary: Three 32 bit unsigned integers description: A vector of three uints. These three uints are packed into a single 128 bit field @@ -378,8 +364,7 @@ description: end: type: uint4 -simple: uint -attrib: ext_vector_type(4) +simple: uint __attribute__((ext_vector_type(4))) summary: Four 32 bit unsigned integers description: A vector of four uints. These four uints are packed into a single 128 bit field @@ -388,8 +373,7 @@ end: type: ulong2 -simple: ulong -attrib: ext_vector_type(2) +simple: ulong __attribute__((ext_vector_type(2))) summary: Two 64 bit unsigned integers description: A vector of two ulongs. These two ulongs are packed into a single 128 bit field @@ -397,8 +381,7 @@ description: end: type: ulong3 -simple: ulong -attrib: ext_vector_type(3) +simple: ulong __attribute__((ext_vector_type(3))) summary: Three 64 bit unsigned integers description: A vector of three ulongs. These three ulong fields packed into a single 256 bit field @@ -406,8 +389,7 @@ description: end: type: ulong4 -simple: ulong -attrib: ext_vector_type(4) +simple: ulong __attribute__((ext_vector_type(4))) summary: Four 64 bit unsigned integers description: A vector of four ulongs. These four ulong fields packed into a single 256 bit field @@ -416,8 +398,7 @@ end: type: char2 -simple: char -attrib: ext_vector_type(2) +simple: char __attribute__((ext_vector_type(2))) summary: Two 8 bit signed integers description: A vector of two chars. These two chars are packed into a single 16 bit field @@ -425,8 +406,7 @@ description: end: type: char3 -simple: char -attrib: ext_vector_type(3) +simple: char __attribute__((ext_vector_type(3))) summary: Three 8 bit signed integers description: A vector of three chars. These three chars are packed into a single 32 bit field @@ -434,8 +414,7 @@ description: end: type: char4 -simple: char -attrib: ext_vector_type(4) +simple: char __attribute__((ext_vector_type(4))) summary: Four 8 bit signed integers description: A vector of four chars. These four chars are packed into a single 32 bit field @@ -444,8 +423,7 @@ end: type: short2 -simple: short -attrib: ext_vector_type(2) +simple: short __attribute__((ext_vector_type(2))) summary: Two 16 bit signed integers description: A vector of two shorts. These two shorts are packed into a single 32 bit field @@ -453,8 +431,7 @@ description: end: type: short3 -simple: short -attrib: ext_vector_type(3) +simple: short __attribute__((ext_vector_type(3))) summary: Three 16 bit signed integers description: A vector of three shorts. These three short fields packed into a single 64 bit field @@ -462,8 +439,7 @@ description: end: type: short4 -simple: short -attrib: ext_vector_type(4) +simple: short __attribute__((ext_vector_type(4))) summary: Four 16 bit signed integers description: A vector of four shorts. These four short fields packed into a single 64 bit field @@ -472,8 +448,7 @@ end: type: int2 -simple: int -attrib: ext_vector_type(2) +simple: int __attribute__((ext_vector_type(2))) summary: Two 32 bit signed integers description: A vector of two ints. These two ints are packed into a single 64 bit field @@ -481,8 +456,7 @@ description: end: type: int3 -simple: int -attrib: ext_vector_type(3) +simple: int __attribute__((ext_vector_type(3))) summary: Three 32 bit signed integers description: A vector of three ints. These three ints are packed into a single 128 bit field @@ -490,8 +464,7 @@ description: end: type: int4 -simple: int -attrib: ext_vector_type(4) +simple: int __attribute__((ext_vector_type(4))) summary: Four 32 bit signed integers description: A vector of four ints. These two fours are packed into a single 128 bit field @@ -500,8 +473,7 @@ end: type: long2 -simple: long -attrib: ext_vector_type(2) +simple: long __attribute__((ext_vector_type(2))) summary: Two 64 bit signed integers description: A vector of two longs. These two longs are packed into a single 128 bit field @@ -509,8 +481,7 @@ description: end: type: long3 -simple: long -attrib: ext_vector_type(3) +simple: long __attribute__((ext_vector_type(3))) summary: Three 64 bit signed integers description: A vector of three longs. These three longs are packed into a single 256 bit field @@ -518,8 +489,7 @@ description: end: type: long4 -simple: long -attrib: ext_vector_type(4) +simple: long __attribute__((ext_vector_type(4))) summary: Four 64 bit signed integers description: A vector of four longs. These four longs are packed into a single 256 bit field diff --git a/driver/runtime/Android.mk b/driver/runtime/Android.mk index d44f70d2..a249bea0 100755 --- a/driver/runtime/Android.mk +++ b/driver/runtime/Android.mk @@ -29,7 +29,7 @@ clcore_base_files := \ rs_sampler.c \ rs_convert.c -clcore_cflags := -Iframeworks/rs/cpu_ref -DRS_DECLARE_EXPIRED_APIS +clcore_includes := -Iframeworks/rs/cpu_ref clcore_base_files_32 := \ ll32/allocation.ll @@ -73,7 +73,7 @@ include frameworks/compile/slang/rs_version.mk include $(CLEAR_VARS) LOCAL_MODULE := libclcore.bc -LOCAL_CFLAGS += $(clcore_cflags) +LOCAL_CFLAGS += $(clcore_includes) LOCAL_SRC_FILES := $(clcore_base_files) LOCAL_SRC_FILES_32 := $(clcore_files_32) LOCAL_SRC_FILES_32 += arch/generic.c @@ -92,7 +92,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := libclcore_debug.bc rs_debug_runtime := 1 -LOCAL_CFLAGS += $(clcore_cflags) +LOCAL_CFLAGS += $(clcore_includes) LOCAL_SRC_FILES := $(clcore_base_files) LOCAL_SRC_FILES_32 := $(clcore_files_32) LOCAL_SRC_FILES_32 += arch/generic.c @@ -112,7 +112,7 @@ ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64)) include $(CLEAR_VARS) LOCAL_MODULE := libclcore_x86.bc -LOCAL_CFLAGS += $(clcore_cflags) +LOCAL_CFLAGS += $(clcore_includes) LOCAL_SRC_FILES := $(clcore_x86_files) LOCAL_SRC_FILES_32 := $(clcore_base_files_32) LOCAL_SRC_FILES_64 := $(clcore_base_files_64) @@ -128,7 +128,7 @@ ifeq ($(ARCH_ARM_HAVE_NEON),true) LOCAL_32_BIT_ONLY := true LOCAL_MODULE := libclcore_neon.bc - LOCAL_CFLAGS += $(clcore_cflags) + LOCAL_CFLAGS += $(clcore_includes) LOCAL_SRC_FILES := $(clcore_neon_files) LOCAL_CFLAGS += -DARCH_ARM_HAVE_NEON @@ -148,7 +148,7 @@ BCC_RS_TRIPLE := armv7-none-linux-gnueabi RS_TRIPLE_CFLAGS := LOCAL_MODULE := librsrt_arm.bc LOCAL_IS_HOST_MODULE := true -LOCAL_CFLAGS += $(clcore_cflags) +LOCAL_CFLAGS += $(clcore_includes) LOCAL_SRC_FILES := $(clcore_files) $(clcore_files_32) include $(LOCAL_PATH)/build_bc_lib.mk @@ -162,7 +162,7 @@ BCC_RS_TRIPLE := armv7-none-linux-gnueabi RS_TRIPLE_CFLAGS := LOCAL_MODULE := librsrt_mips.bc LOCAL_IS_HOST_MODULE := true -LOCAL_CFLAGS += $(clcore_cflags) +LOCAL_CFLAGS += $(clcore_includes) LOCAL_SRC_FILES := $(clcore_files) $(clcore_files_32) include $(LOCAL_PATH)/build_bc_lib.mk @@ -176,7 +176,7 @@ BCC_RS_TRIPLE := armv7-none-linux-gnueabi RS_TRIPLE_CFLAGS := -D__i386__ LOCAL_MODULE := librsrt_x86.bc LOCAL_IS_HOST_MODULE := true -LOCAL_CFLAGS += $(clcore_cflags) +LOCAL_CFLAGS += $(clcore_includes) LOCAL_SRC_FILES := $(clcore_x86_files) $(clcore_base_files_32) include $(LOCAL_PATH)/build_bc_lib.mk @@ -186,6 +186,6 @@ BCC_RS_TRIPLE := aarch64-linux-android RS_TRIPLE_CFLAGS := LOCAL_MODULE := librsrt_arm64.bc LOCAL_IS_HOST_MODULE := true -LOCAL_CFLAGS += $(clcore_cflags) +LOCAL_CFLAGS += $(clcore_includes) LOCAL_SRC_FILES := $(clcore_files) $(clcore_files_64) include $(LOCAL_PATH)/build_bc_lib.mk diff --git a/java/tests/RsBLAS_Benchmark/AndroidManifest.xml b/java/tests/RsBLAS_Benchmark/AndroidManifest.xml index a6ce5cb8..4a2f7df6 100644 --- a/java/tests/RsBLAS_Benchmark/AndroidManifest.xml +++ b/java/tests/RsBLAS_Benchmark/AndroidManifest.xml @@ -22,6 +22,10 @@ <application android:label="RsBlasBenchmark"> <activity android:name="BlasBenchmark" android:hardwareAccelerated="true"> + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + <category android:name="android.intent.category.LAUNCHER" /> + </intent-filter> </activity> <activity class=".BlasControls" android:name="BlasControls"> diff --git a/scriptc/rs_convert.rsh b/scriptc/rs_convert.rsh index 66e47c64..7cf6c504 100644 --- a/scriptc/rs_convert.rsh +++ b/scriptc/rs_convert.rsh @@ -1249,13 +1249,9 @@ extern ulong4 __attribute__((const, overloadable)) /* * rsPackColorTo8888: Create a uchar4 RGBA from floats * - * Packs three or four floating point RGBA values into a uchar4. - * - * The input values are typically between 0.0 and 1.0 inclusive. For input values outside - * of this range, the resulting outputs will be clamped to be between 0 and 255. As this - * clamping may be done after the input is multiplied by 255.f and converted to an integer, - * input numbers greater than INT_MAX/255.f or less than INT_MIN/255.f can result in - * undefined behavior. + * Packs three or four floating point RGBA values into a uchar4. The RGBA values should be + * between 0.0 and 1.0 inclusive. Values outside of this range are clamped to this range. + * However numbers greater than INT_MAX or less than INT_MIN can result in undefined behavior. * * If the alpha component is not specified, it is assumed to be 1.0, i.e. the result will * have an alpha set to 255. diff --git a/scriptc/rs_graphics.rsh b/scriptc/rs_graphics.rsh index 2a78018b..5439f061 100644 --- a/scriptc/rs_graphics.rsh +++ b/scriptc/rs_graphics.rsh @@ -19,7 +19,7 @@ /* * rs_graphics.rsh: Graphics Functions and Types * - * The graphics subsystem of RenderScript was removed at API level 23. + * The graphics subsystem of RenderScript has been deprecated. */ #ifndef RENDERSCRIPT_RS_GRAPHICS_RSH @@ -40,12 +40,8 @@ * */ #ifndef __LP64__ -#if (defined(RS_VERSION) && (RS_VERSION >= 16) && (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22)) -typedef enum __attribute__(( -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -deprecated -#endif -)) { +#if (defined(RS_VERSION) && (RS_VERSION >= 16)) +typedef enum { RS_BLEND_SRC_ZERO = 0, RS_BLEND_SRC_ONE = 1, RS_BLEND_SRC_DST_COLOR = 2, @@ -67,12 +63,8 @@ deprecated * */ #ifndef __LP64__ -#if (defined(RS_VERSION) && (RS_VERSION >= 16) && (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22)) -typedef enum __attribute__(( -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -deprecated -#endif -)) { +#if (defined(RS_VERSION) && (RS_VERSION >= 16)) +typedef enum { RS_BLEND_DST_ZERO = 0, RS_BLEND_DST_ONE = 1, RS_BLEND_DST_SRC_COLOR = 2, @@ -93,12 +85,8 @@ deprecated * */ #ifndef __LP64__ -#if (defined(RS_VERSION) && (RS_VERSION >= 16) && (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22)) -typedef enum __attribute__(( -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -deprecated -#endif -)) { +#if (defined(RS_VERSION) && (RS_VERSION >= 16)) +typedef enum { RS_CULL_BACK = 0, RS_CULL_FRONT = 1, RS_CULL_NONE = 2, @@ -116,12 +104,8 @@ deprecated * depth to that found in the depth buffer. */ #ifndef __LP64__ -#if (defined(RS_VERSION) && (RS_VERSION >= 16) && (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22)) -typedef enum __attribute__(( -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -deprecated -#endif -)) { +#if (defined(RS_VERSION) && (RS_VERSION >= 16)) +typedef enum { RS_DEPTH_FUNC_ALWAYS = 0, // Always drawn RS_DEPTH_FUNC_LESS = 1, // Drawn if the incoming depth value is less than that in the depth buffer RS_DEPTH_FUNC_LEQUAL = 2, // Drawn if the incoming depth value is less or equal to that in the depth buffer @@ -142,12 +126,8 @@ deprecated * Describes the way mesh vertex data is interpreted when rendering */ #ifndef __LP64__ -#if (defined(RS_VERSION) && (RS_VERSION >= 16) && (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22)) -typedef enum __attribute__(( -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -deprecated -#endif -)) { +#if (defined(RS_VERSION) && (RS_VERSION >= 16)) +typedef enum { RS_PRIMITIVE_POINT = 0, // Vertex data will be rendered as a series of points RS_PRIMITIVE_LINE = 1, // Vertex pairs will be rendered as lines RS_PRIMITIVE_LINE_STRIP = 2, // Vertex data will be rendered as a connected line strip @@ -168,13 +148,7 @@ deprecated * See: android.renderscript.Font */ #ifndef __LP64__ -#if !defined(RS_VERSION) || (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22) -typedef _RS_HANDLE __attribute__(( -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -deprecated -#endif -)) rs_font; -#endif +typedef _RS_HANDLE rs_font; #endif /* @@ -186,13 +160,7 @@ deprecated * See: android.renderscript.Mesh */ #ifndef __LP64__ -#if !defined(RS_VERSION) || (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22) -typedef _RS_HANDLE __attribute__(( -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -deprecated -#endif -)) rs_mesh; -#endif +typedef _RS_HANDLE rs_mesh; #endif /* @@ -204,13 +172,7 @@ deprecated * See: android.renderscript.ProgramFragment */ #ifndef __LP64__ -#if !defined(RS_VERSION) || (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22) -typedef _RS_HANDLE __attribute__(( -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -deprecated -#endif -)) rs_program_fragment; -#endif +typedef _RS_HANDLE rs_program_fragment; #endif /* @@ -222,13 +184,7 @@ deprecated * See: android.renderscript.ProgramVertex */ #ifndef __LP64__ -#if !defined(RS_VERSION) || (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22) -typedef _RS_HANDLE __attribute__(( -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -deprecated -#endif -)) rs_program_vertex; -#endif +typedef _RS_HANDLE rs_program_vertex; #endif /* @@ -240,13 +196,7 @@ deprecated * See: android.renderscript.ProgramRaster */ #ifndef __LP64__ -#if !defined(RS_VERSION) || (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22) -typedef _RS_HANDLE __attribute__(( -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -deprecated -#endif -)) rs_program_raster; -#endif +typedef _RS_HANDLE rs_program_raster; #endif /* @@ -258,13 +208,7 @@ deprecated * See: android.renderscript.ProgramStore */ #ifndef __LP64__ -#if !defined(RS_VERSION) || (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22) -typedef _RS_HANDLE __attribute__(( -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -deprecated -#endif -)) rs_program_store; -#endif +typedef _RS_HANDLE rs_program_store; #endif /* @@ -276,46 +220,34 @@ deprecated * After calling this function, *dst will be set to an empty handle. See rsIsObject(). */ #ifndef __LP64__ -#if !defined(RS_VERSION) || (RS_VERSION <= 22) extern void __attribute__((overloadable)) rsClearObject(rs_mesh* dst); #endif -#endif #ifndef __LP64__ -#if !defined(RS_VERSION) || (RS_VERSION <= 22) extern void __attribute__((overloadable)) rsClearObject(rs_program_fragment* dst); #endif -#endif #ifndef __LP64__ -#if !defined(RS_VERSION) || (RS_VERSION <= 22) extern void __attribute__((overloadable)) rsClearObject(rs_program_vertex* dst); #endif -#endif #ifndef __LP64__ -#if !defined(RS_VERSION) || (RS_VERSION <= 22) extern void __attribute__((overloadable)) rsClearObject(rs_program_raster* dst); #endif -#endif #ifndef __LP64__ -#if !defined(RS_VERSION) || (RS_VERSION <= 22) extern void __attribute__((overloadable)) rsClearObject(rs_program_store* dst); #endif -#endif #ifndef __LP64__ -#if !defined(RS_VERSION) || (RS_VERSION <= 22) extern void __attribute__((overloadable)) rsClearObject(rs_font* dst); #endif -#endif /* * rsIsObject: Check for an empty handle @@ -329,92 +261,68 @@ extern void __attribute__((overloadable)) * or see if rsClearObject() has been called on a handle. */ #ifndef __LP64__ -#if !defined(RS_VERSION) || (RS_VERSION <= 22) extern bool __attribute__((overloadable)) rsIsObject(rs_mesh v); #endif -#endif #ifndef __LP64__ -#if !defined(RS_VERSION) || (RS_VERSION <= 22) extern bool __attribute__((overloadable)) rsIsObject(rs_program_fragment v); #endif -#endif #ifndef __LP64__ -#if !defined(RS_VERSION) || (RS_VERSION <= 22) extern bool __attribute__((overloadable)) rsIsObject(rs_program_vertex v); #endif -#endif #ifndef __LP64__ -#if !defined(RS_VERSION) || (RS_VERSION <= 22) extern bool __attribute__((overloadable)) rsIsObject(rs_program_raster v); #endif -#endif #ifndef __LP64__ -#if !defined(RS_VERSION) || (RS_VERSION <= 22) extern bool __attribute__((overloadable)) rsIsObject(rs_program_store v); #endif -#endif #ifndef __LP64__ -#if !defined(RS_VERSION) || (RS_VERSION <= 22) extern bool __attribute__((overloadable)) rsIsObject(rs_font v); #endif -#endif /* * rsSetObject: For internal use. * */ #ifndef __LP64__ -#if !defined(RS_VERSION) || (RS_VERSION <= 22) extern void __attribute__((overloadable)) rsSetObject(rs_mesh* dst, rs_mesh src); #endif -#endif #ifndef __LP64__ -#if !defined(RS_VERSION) || (RS_VERSION <= 22) extern void __attribute__((overloadable)) rsSetObject(rs_program_fragment* dst, rs_program_fragment src); #endif -#endif #ifndef __LP64__ -#if !defined(RS_VERSION) || (RS_VERSION <= 22) extern void __attribute__((overloadable)) rsSetObject(rs_program_vertex* dst, rs_program_vertex src); #endif -#endif #ifndef __LP64__ -#if !defined(RS_VERSION) || (RS_VERSION <= 22) extern void __attribute__((overloadable)) rsSetObject(rs_program_raster* dst, rs_program_raster src); #endif -#endif #ifndef __LP64__ -#if !defined(RS_VERSION) || (RS_VERSION <= 22) extern void __attribute__((overloadable)) rsSetObject(rs_program_store* dst, rs_program_store src); #endif -#endif #ifndef __LP64__ -#if !defined(RS_VERSION) || (RS_VERSION <= 22) extern void __attribute__((overloadable)) rsSetObject(rs_font* dst, rs_font src); #endif -#endif /* * rsgAllocationSyncAll: Sync the contents of an allocation @@ -429,23 +337,13 @@ extern void __attribute__((overloadable)) * memory spaces. */ #ifndef __LP64__ -#if !defined(RS_VERSION) || (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22) -extern void __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +extern void __attribute__((overloadable)) rsgAllocationSyncAll(rs_allocation alloc); #endif -#endif #ifndef __LP64__ -#if (defined(RS_VERSION) && (RS_VERSION >= 14) && (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22)) -extern void __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +#if (defined(RS_VERSION) && (RS_VERSION >= 14)) +extern void __attribute__((overloadable)) rsgAllocationSyncAll(rs_allocation alloc, rs_allocation_usage_type source); #endif #endif @@ -458,12 +356,8 @@ extern void __attribute__((overloadable * Set the color target used for all subsequent rendering calls */ #ifndef __LP64__ -#if (defined(RS_VERSION) && (RS_VERSION >= 14) && (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22)) -extern void __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +#if (defined(RS_VERSION) && (RS_VERSION >= 14)) +extern void __attribute__((overloadable)) rsgBindColorTarget(rs_allocation colorTarget, uint slot); #endif #endif @@ -483,26 +377,14 @@ extern void __attribute__((overloadable * pv: program vertex object */ #ifndef __LP64__ -#if !defined(RS_VERSION) || (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22) -extern void __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +extern void __attribute__((overloadable)) rsgBindConstant(rs_program_fragment ps, uint slot, rs_allocation c); #endif -#endif #ifndef __LP64__ -#if !defined(RS_VERSION) || (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22) -extern void __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +extern void __attribute__((overloadable)) rsgBindConstant(rs_program_vertex pv, uint slot, rs_allocation c); #endif -#endif /* * rsgBindDepthTarget: Set the depth target @@ -512,12 +394,8 @@ extern void __attribute__((overloadable * Set the depth target used for all subsequent rendering calls */ #ifndef __LP64__ -#if (defined(RS_VERSION) && (RS_VERSION >= 14) && (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22)) -extern void __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +#if (defined(RS_VERSION) && (RS_VERSION >= 14)) +extern void __attribute__((overloadable)) rsgBindDepthTarget(rs_allocation depthTarget); #endif #endif @@ -533,15 +411,9 @@ extern void __attribute__((overloadable * font: object to bind */ #ifndef __LP64__ -#if !defined(RS_VERSION) || (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22) -extern void __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +extern void __attribute__((overloadable)) rsgBindFont(rs_font font); #endif -#endif /* * rsgBindProgramFragment: Bind a ProgramFragment @@ -551,15 +423,9 @@ extern void __attribute__((overloadable * Bind a new ProgramFragment to the rendering context. */ #ifndef __LP64__ -#if !defined(RS_VERSION) || (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22) -extern void __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +extern void __attribute__((overloadable)) rsgBindProgramFragment(rs_program_fragment pf); #endif -#endif /* * rsgBindProgramRaster: Bind a ProgramRaster @@ -569,15 +435,9 @@ extern void __attribute__((overloadable * Bind a new ProgramRaster to the rendering context. */ #ifndef __LP64__ -#if !defined(RS_VERSION) || (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22) -extern void __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +extern void __attribute__((overloadable)) rsgBindProgramRaster(rs_program_raster pr); #endif -#endif /* * rsgBindProgramStore: Bind a ProgramStore @@ -587,15 +447,9 @@ extern void __attribute__((overloadable * Bind a new ProgramStore to the rendering context. */ #ifndef __LP64__ -#if !defined(RS_VERSION) || (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22) -extern void __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +extern void __attribute__((overloadable)) rsgBindProgramStore(rs_program_store ps); #endif -#endif /* * rsgBindProgramVertex: Bind a ProgramVertex @@ -605,15 +459,9 @@ extern void __attribute__((overloadable * Bind a new ProgramVertex to the rendering context. */ #ifndef __LP64__ -#if !defined(RS_VERSION) || (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22) -extern void __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +extern void __attribute__((overloadable)) rsgBindProgramVertex(rs_program_vertex pv); #endif -#endif /* * rsgBindSampler: Bind a sampler @@ -624,15 +472,9 @@ extern void __attribute__((overloadable * operate on the texture bound at the matching slot. */ #ifndef __LP64__ -#if !defined(RS_VERSION) || (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22) -extern void __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +extern void __attribute__((overloadable)) rsgBindSampler(rs_program_fragment fragment, uint slot, rs_sampler sampler); #endif -#endif /* * rsgBindTexture: Bind a texture allocation @@ -645,15 +487,9 @@ extern void __attribute__((overloadable * matching slot. */ #ifndef __LP64__ -#if !defined(RS_VERSION) || (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22) -extern void __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +extern void __attribute__((overloadable)) rsgBindTexture(rs_program_fragment v, uint slot, rs_allocation alloc); #endif -#endif /* * rsgClearAllRenderTargets: Clear all color and depth targets @@ -664,12 +500,8 @@ extern void __attribute__((overloadable * the framebuffer */ #ifndef __LP64__ -#if (defined(RS_VERSION) && (RS_VERSION >= 14) && (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22)) -extern void __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +#if (defined(RS_VERSION) && (RS_VERSION >= 14)) +extern void __attribute__((overloadable)) rsgClearAllRenderTargets(void); #endif #endif @@ -682,15 +514,9 @@ extern void __attribute__((overloadable * Clears the rendering surface to the specified color. */ #ifndef __LP64__ -#if !defined(RS_VERSION) || (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22) -extern void __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +extern void __attribute__((overloadable)) rsgClearColor(float r, float g, float b, float a); #endif -#endif /* * rsgClearColorTarget: Clear the color target @@ -700,12 +526,8 @@ extern void __attribute__((overloadable * Clear the previously set color target */ #ifndef __LP64__ -#if (defined(RS_VERSION) && (RS_VERSION >= 14) && (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22)) -extern void __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +#if (defined(RS_VERSION) && (RS_VERSION >= 14)) +extern void __attribute__((overloadable)) rsgClearColorTarget(uint slot); #endif #endif @@ -718,15 +540,9 @@ extern void __attribute__((overloadable * Clears the depth suface to the specified value. */ #ifndef __LP64__ -#if !defined(RS_VERSION) || (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22) -extern void __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +extern void __attribute__((overloadable)) rsgClearDepth(float value); #endif -#endif /* * rsgClearDepthTarget: Clear the depth target @@ -736,12 +552,8 @@ extern void __attribute__((overloadable * Clear the previously set depth target */ #ifndef __LP64__ -#if (defined(RS_VERSION) && (RS_VERSION >= 14) && (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22)) -extern void __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +#if (defined(RS_VERSION) && (RS_VERSION >= 14)) +extern void __attribute__((overloadable)) rsgClearDepthTarget(void); #endif #endif @@ -766,37 +578,19 @@ extern void __attribute__((overloadable * len: number of indices to draw */ #ifndef __LP64__ -#if !defined(RS_VERSION) || (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22) -extern void __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +extern void __attribute__((overloadable)) rsgDrawMesh(rs_mesh ism); #endif -#endif #ifndef __LP64__ -#if !defined(RS_VERSION) || (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22) -extern void __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +extern void __attribute__((overloadable)) rsgDrawMesh(rs_mesh ism, uint primitiveIndex); #endif -#endif #ifndef __LP64__ -#if !defined(RS_VERSION) || (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22) -extern void __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +extern void __attribute__((overloadable)) rsgDrawMesh(rs_mesh ism, uint primitiveIndex, uint start, uint len); #endif -#endif /* * rsgDrawQuad: Draw a quad @@ -807,16 +601,10 @@ extern void __attribute__((overloadable * drawing large quantities of geometry. */ #ifndef __LP64__ -#if !defined(RS_VERSION) || (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22) -extern void __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +extern void __attribute__((overloadable)) rsgDrawQuad(float x1, float y1, float z1, float x2, float y2, float z2, float x3, float y3, float z3, float x4, float y4, float z4); #endif -#endif /* * rsgDrawQuadTexCoords: Draw a textured quad @@ -827,17 +615,11 @@ extern void __attribute__((overloadable * for drawing large quantities of geometry. */ #ifndef __LP64__ -#if !defined(RS_VERSION) || (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22) -extern void __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +extern void __attribute__((overloadable)) rsgDrawQuadTexCoords(float x1, float y1, float z1, float u1, float v1, float x2, float y2, float z2, float u2, float v2, float x3, float y3, float z3, float u3, float v3, float x4, float y4, float z4, float u4, float v4); #endif -#endif /* * rsgDrawRect: Draw a rectangle @@ -848,15 +630,9 @@ extern void __attribute__((overloadable * intended for drawing large quantities of geometry. */ #ifndef __LP64__ -#if !defined(RS_VERSION) || (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22) -extern void __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +extern void __attribute__((overloadable)) rsgDrawRect(float x1, float y1, float x2, float y2, float z); #endif -#endif /* * rsgDrawSpriteScreenspace: Draw rectangles in screenspace @@ -869,15 +645,9 @@ extern void __attribute__((overloadable * for drawing in shipping applications. */ #ifndef __LP64__ -#if !defined(RS_VERSION) || (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22) -extern void __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +extern void __attribute__((overloadable)) rsgDrawSpriteScreenspace(float x, float y, float z, float w, float h); #endif -#endif /* * rsgDrawText: Draw a text string @@ -887,26 +657,14 @@ extern void __attribute__((overloadable * Draws text given a string and location */ #ifndef __LP64__ -#if !defined(RS_VERSION) || (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22) -extern void __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +extern void __attribute__((overloadable)) rsgDrawText(const char* text, int x, int y); #endif -#endif #ifndef __LP64__ -#if !defined(RS_VERSION) || (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22) -extern void __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +extern void __attribute__((overloadable)) rsgDrawText(rs_allocation alloc, int x, int y); #endif -#endif /* * rsgFinish: End rendering commands @@ -916,12 +674,8 @@ extern void __attribute__((overloadable * Force RenderScript to finish all rendering commands */ #ifndef __LP64__ -#if (defined(RS_VERSION) && (RS_VERSION >= 14) && (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22)) -extern uint __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +#if (defined(RS_VERSION) && (RS_VERSION >= 14)) +extern uint __attribute__((overloadable)) rsgFinish(void); #endif #endif @@ -940,15 +694,9 @@ extern uint __attribute__((overloadable * a: alpha component */ #ifndef __LP64__ -#if !defined(RS_VERSION) || (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22) -extern void __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +extern void __attribute__((overloadable)) rsgFontColor(float r, float g, float b, float a); #endif -#endif /* * rsgGetHeight: Get the surface height @@ -958,15 +706,9 @@ extern void __attribute__((overloadable * Get the height of the current rendering surface. */ #ifndef __LP64__ -#if !defined(RS_VERSION) || (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22) -extern uint __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +extern uint __attribute__((overloadable)) rsgGetHeight(void); #endif -#endif /* * rsgGetWidth: Get the surface width @@ -976,15 +718,9 @@ extern uint __attribute__((overloadable * Get the width of the current rendering surface. */ #ifndef __LP64__ -#if !defined(RS_VERSION) || (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22) -extern uint __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +extern uint __attribute__((overloadable)) rsgGetWidth(void); #endif -#endif /* * rsgMeasureText: Get the bounding box for a text string @@ -995,26 +731,14 @@ extern uint __attribute__((overloadable * Any of left, right, top, bottom could be NULL */ #ifndef __LP64__ -#if !defined(RS_VERSION) || (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22) -extern void __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +extern void __attribute__((overloadable)) rsgMeasureText(const char* text, int* left, int* right, int* top, int* bottom); #endif -#endif #ifndef __LP64__ -#if !defined(RS_VERSION) || (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22) -extern void __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +extern void __attribute__((overloadable)) rsgMeasureText(rs_allocation alloc, int* left, int* right, int* top, int* bottom); #endif -#endif /* * rsgMeshComputeBoundingBox: Compute a bounding box @@ -1024,24 +748,13 @@ extern void __attribute__((overloadable * Computes an axis aligned bounding box of a mesh object */ #ifndef __LP64__ -#if !defined(RS_VERSION) || (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22) -extern void __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +extern void __attribute__((overloadable)) rsgMeshComputeBoundingBox(rs_mesh mesh, float* minX, float* minY, float* min, float* maxX, float* maxY, float* maxZ); #endif -#endif #ifndef __LP64__ -#if !defined(RS_VERSION) || (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22) -static inline void __attribute__((always_inline, overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +static inline void __attribute__((always_inline, overloadable)) rsgMeshComputeBoundingBox(rs_mesh mesh, float3* bBoxMin, float3* bBoxMax) { float x1, y1, z1, x2, y2, z2; rsgMeshComputeBoundingBox(mesh, &x1, &y1, &z1, &x2, &y2, &z2); @@ -1053,7 +766,6 @@ static inline void __attribute__((always_inline, overloadable bBoxMax->z = z2; } #endif -#endif /* * rsgMeshGetIndexAllocation: Return an allocation containing index data @@ -1070,12 +782,8 @@ static inline void __attribute__((always_inline, overloadable * Returns: allocation containing index data */ #ifndef __LP64__ -#if (defined(RS_VERSION) && (RS_VERSION >= 16) && (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22)) -extern rs_allocation __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +#if (defined(RS_VERSION) && (RS_VERSION >= 16)) +extern rs_allocation __attribute__((overloadable)) rsgMeshGetIndexAllocation(rs_mesh m, uint32_t index); #endif #endif @@ -1095,12 +803,8 @@ extern rs_allocation __attribute__((overloadable * Returns: primitive describing how the mesh is rendered */ #ifndef __LP64__ -#if (defined(RS_VERSION) && (RS_VERSION >= 16) && (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22)) -extern rs_primitive __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +#if (defined(RS_VERSION) && (RS_VERSION >= 16)) +extern rs_primitive __attribute__((overloadable)) rsgMeshGetPrimitive(rs_mesh m, uint32_t index); #endif #endif @@ -1119,12 +823,8 @@ extern rs_primitive __attribute__((overloadable * Returns: number of primitive groups in the mesh. This would include simple primitives as well as allocations containing index data */ #ifndef __LP64__ -#if (defined(RS_VERSION) && (RS_VERSION >= 16) && (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22)) -extern uint32_t __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +#if (defined(RS_VERSION) && (RS_VERSION >= 16)) +extern uint32_t __attribute__((overloadable)) rsgMeshGetPrimitiveCount(rs_mesh m); #endif #endif @@ -1144,12 +844,8 @@ extern uint32_t __attribute__((overloadable * Returns: allocation containing vertex data */ #ifndef __LP64__ -#if (defined(RS_VERSION) && (RS_VERSION >= 16) && (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22)) -extern rs_allocation __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +#if (defined(RS_VERSION) && (RS_VERSION >= 16)) +extern rs_allocation __attribute__((overloadable)) rsgMeshGetVertexAllocation(rs_mesh m, uint32_t index); #endif #endif @@ -1168,12 +864,8 @@ extern rs_allocation __attribute__((overloadable * Returns: number of allocations in the mesh that contain vertex data */ #ifndef __LP64__ -#if (defined(RS_VERSION) && (RS_VERSION >= 16) && (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22)) -extern uint32_t __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +#if (defined(RS_VERSION) && (RS_VERSION >= 16)) +extern uint32_t __attribute__((overloadable)) rsgMeshGetVertexAllocationCount(rs_mesh m); #endif #endif @@ -1186,15 +878,9 @@ extern uint32_t __attribute__((overloadable * Set the constant color for a fixed function emulation program. */ #ifndef __LP64__ -#if !defined(RS_VERSION) || (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22) -extern void __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +extern void __attribute__((overloadable)) rsgProgramFragmentConstantColor(rs_program_fragment pf, float r, float g, float b, float a); #endif -#endif /* * rsgProgramVertexGetProjectionMatrix: Get the projection matrix for a fixed function vertex program @@ -1209,15 +895,9 @@ extern void __attribute__((overloadable * proj: matrix to store the current projection matrix into */ #ifndef __LP64__ -#if !defined(RS_VERSION) || (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22) -extern void __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +extern void __attribute__((overloadable)) rsgProgramVertexGetProjectionMatrix(rs_matrix4x4* proj); #endif -#endif /* * rsgProgramVertexLoadModelMatrix: Load the model matrix for a bound fixed function vertex program @@ -1232,15 +912,9 @@ extern void __attribute__((overloadable * model: model matrix */ #ifndef __LP64__ -#if !defined(RS_VERSION) || (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22) -extern void __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +extern void __attribute__((overloadable)) rsgProgramVertexLoadModelMatrix(const rs_matrix4x4* model); #endif -#endif /* * rsgProgramVertexLoadProjectionMatrix: Load the projection matrix for a bound fixed function vertex program @@ -1255,15 +929,9 @@ extern void __attribute__((overloadable * proj: projection matrix */ #ifndef __LP64__ -#if !defined(RS_VERSION) || (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22) -extern void __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +extern void __attribute__((overloadable)) rsgProgramVertexLoadProjectionMatrix(const rs_matrix4x4* proj); #endif -#endif /* * rsgProgramVertexLoadTextureMatrix: Load the texture matrix for a bound fixed function vertex program @@ -1278,15 +946,9 @@ extern void __attribute__((overloadable * tex: texture matrix */ #ifndef __LP64__ -#if !defined(RS_VERSION) || (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22) -extern void __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +extern void __attribute__((overloadable)) rsgProgramVertexLoadTextureMatrix(const rs_matrix4x4* tex); #endif -#endif /* * rsgProgramRasterGetCullMode: Get program raster cull mode @@ -1299,12 +961,8 @@ extern void __attribute__((overloadable * pr: program raster to query */ #ifndef __LP64__ -#if (defined(RS_VERSION) && (RS_VERSION >= 16) && (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22)) -extern rs_cull_mode __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +#if (defined(RS_VERSION) && (RS_VERSION >= 16)) +extern rs_cull_mode __attribute__((overloadable)) rsgProgramRasterGetCullMode(rs_program_raster pr); #endif #endif @@ -1320,12 +978,8 @@ extern rs_cull_mode __attribute__((overloadable * pr: program raster to query */ #ifndef __LP64__ -#if (defined(RS_VERSION) && (RS_VERSION >= 16) && (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22)) -extern bool __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +#if (defined(RS_VERSION) && (RS_VERSION >= 16)) +extern bool __attribute__((overloadable)) rsgProgramRasterIsPointSpriteEnabled(rs_program_raster pr); #endif #endif @@ -1341,12 +995,8 @@ extern bool __attribute__((overloadable * ps: program store to query */ #ifndef __LP64__ -#if (defined(RS_VERSION) && (RS_VERSION >= 16) && (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22)) -extern rs_blend_dst_func __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +#if (defined(RS_VERSION) && (RS_VERSION >= 16)) +extern rs_blend_dst_func __attribute__((overloadable)) rsgProgramStoreGetBlendDstFunc(rs_program_store ps); #endif #endif @@ -1362,12 +1012,8 @@ extern rs_blend_dst_func __attribute__((overloadable * ps: program store to query */ #ifndef __LP64__ -#if (defined(RS_VERSION) && (RS_VERSION >= 16) && (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22)) -extern rs_blend_src_func __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +#if (defined(RS_VERSION) && (RS_VERSION >= 16)) +extern rs_blend_src_func __attribute__((overloadable)) rsgProgramStoreGetBlendSrcFunc(rs_program_store ps); #endif #endif @@ -1383,12 +1029,8 @@ extern rs_blend_src_func __attribute__((overloadable * ps: program store to query */ #ifndef __LP64__ -#if (defined(RS_VERSION) && (RS_VERSION >= 16) && (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22)) -extern rs_depth_func __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +#if (defined(RS_VERSION) && (RS_VERSION >= 16)) +extern rs_depth_func __attribute__((overloadable)) rsgProgramStoreGetDepthFunc(rs_program_store ps); #endif #endif @@ -1404,12 +1046,8 @@ extern rs_depth_func __attribute__((overloadable * ps: program store to query */ #ifndef __LP64__ -#if (defined(RS_VERSION) && (RS_VERSION >= 16) && (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22)) -extern bool __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +#if (defined(RS_VERSION) && (RS_VERSION >= 16)) +extern bool __attribute__((overloadable)) rsgProgramStoreIsColorMaskAlphaEnabled(rs_program_store ps); #endif #endif @@ -1425,12 +1063,8 @@ extern bool __attribute__((overloadable * ps: program store to query */ #ifndef __LP64__ -#if (defined(RS_VERSION) && (RS_VERSION >= 16) && (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22)) -extern bool __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +#if (defined(RS_VERSION) && (RS_VERSION >= 16)) +extern bool __attribute__((overloadable)) rsgProgramStoreIsColorMaskBlueEnabled(rs_program_store ps); #endif #endif @@ -1446,12 +1080,8 @@ extern bool __attribute__((overloadable * ps: program store to query */ #ifndef __LP64__ -#if (defined(RS_VERSION) && (RS_VERSION >= 16) && (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22)) -extern bool __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +#if (defined(RS_VERSION) && (RS_VERSION >= 16)) +extern bool __attribute__((overloadable)) rsgProgramStoreIsColorMaskGreenEnabled(rs_program_store ps); #endif #endif @@ -1467,12 +1097,8 @@ extern bool __attribute__((overloadable * ps: program store to query */ #ifndef __LP64__ -#if (defined(RS_VERSION) && (RS_VERSION >= 16) && (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22)) -extern bool __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +#if (defined(RS_VERSION) && (RS_VERSION >= 16)) +extern bool __attribute__((overloadable)) rsgProgramStoreIsColorMaskRedEnabled(rs_program_store ps); #endif #endif @@ -1488,12 +1114,8 @@ extern bool __attribute__((overloadable * ps: program store to query */ #ifndef __LP64__ -#if (defined(RS_VERSION) && (RS_VERSION >= 16) && (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22)) -extern bool __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +#if (defined(RS_VERSION) && (RS_VERSION >= 16)) +extern bool __attribute__((overloadable)) rsgProgramStoreIsDepthMaskEnabled(rs_program_store ps); #endif #endif @@ -1509,12 +1131,8 @@ extern bool __attribute__((overloadable * ps: program store to query */ #ifndef __LP64__ -#if (defined(RS_VERSION) && (RS_VERSION >= 16) && (defined(RS_DECLARE_EXPIRED_APIS) || RS_VERSION <= 22)) -extern bool __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated -#endif -)) +#if (defined(RS_VERSION) && (RS_VERSION >= 16)) +extern bool __attribute__((overloadable)) rsgProgramStoreIsDitherEnabled(rs_program_store ps); #endif #endif diff --git a/scriptc/rs_math.rsh b/scriptc/rs_math.rsh index 91258541..7ab69756 100644 --- a/scriptc/rs_math.rsh +++ b/scriptc/rs_math.rsh @@ -4083,46 +4083,22 @@ extern float4 __attribute__((const, overloadable)) * low: Lower bound. * high: Upper bound. */ -extern char __attribute__((const, always_inline, overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated("Use clamp() instead.") -#endif -)) +extern char __attribute__((const, always_inline, overloadable)) rsClamp(char amount, char low, char high); -extern uchar __attribute__((const, always_inline, overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated("Use clamp() instead.") -#endif -)) +extern uchar __attribute__((const, always_inline, overloadable)) rsClamp(uchar amount, uchar low, uchar high); -extern short __attribute__((const, always_inline, overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated("Use clamp() instead.") -#endif -)) +extern short __attribute__((const, always_inline, overloadable)) rsClamp(short amount, short low, short high); -extern ushort __attribute__((const, always_inline, overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated("Use clamp() instead.") -#endif -)) +extern ushort __attribute__((const, always_inline, overloadable)) rsClamp(ushort amount, ushort low, ushort high); -extern int __attribute__((const, always_inline, overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated("Use clamp() instead.") -#endif -)) +extern int __attribute__((const, always_inline, overloadable)) rsClamp(int amount, int low, int high); -extern uint __attribute__((const, always_inline, overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated("Use clamp() instead.") -#endif -)) +extern uint __attribute__((const, always_inline, overloadable)) rsClamp(uint amount, uint low, uint high); /* @@ -4132,11 +4108,7 @@ extern uint __attribute__((const, always_inline, overloadable * * Returns the fractional part of a float */ -extern float __attribute__((const, overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated("Use fract() instead.") -#endif -)) +extern float __attribute__((const, overloadable)) rsFrac(float v); /* diff --git a/scriptc/rs_object_info.rsh b/scriptc/rs_object_info.rsh index d4c40fee..4305f2af 100644 --- a/scriptc/rs_object_info.rsh +++ b/scriptc/rs_object_info.rsh @@ -373,11 +373,7 @@ extern uint32_t __attribute__((overloadable)) * Returns the Allocation for a given pointer. The pointer should point within a valid * allocation. The results are undefined if the pointer is not from a valid Allocation. */ -extern rs_allocation __attribute__((overloadable -#if (defined(RS_VERSION) && (RS_VERSION >= 22)) -, deprecated("This function is deprecated and will be removed from the SDK in a future release.") -#endif -)) +extern rs_allocation __attribute__((overloadable)) rsGetAllocation(const void* p); /* diff --git a/update_rs_prebuilts.sh b/update_rs_prebuilts.sh index 385c5636..89d7ac1b 100755 --- a/update_rs_prebuilts.sh +++ b/update_rs_prebuilts.sh @@ -138,7 +138,7 @@ if [ $DARWIN -eq 0 ]; then done # javalib.jar - cp $MY_ANDROID_DIR/out/target/common/obj/JAVA_LIBRARIES/android-support-v8-renderscript_intermediates/classes.jar renderscript/lib/javalib.jar + cp $MY_ANDROID_DIR/out/target/common/obj/JAVA_LIBRARIES/android-support-v8-renderscript_intermediates/javalib.jar renderscript/lib fi |