diff options
author | Stephen Hines <srhines@google.com> | 2011-11-22 19:43:58 -0800 |
---|---|---|
committer | Stephen Hines <srhines@google.com> | 2011-11-22 20:10:45 -0800 |
commit | f8d4469e2f51740bd7c0e48f6da024a75c4ef372 (patch) | |
tree | 4fad047fb8737f1400428fc27e1e92760a15d258 /rsScriptC.cpp | |
parent | 791916465b75a6ffcc5e08bb230bf7737a9149d4 (diff) | |
download | rs-f8d4469e2f51740bd7c0e48f6da024a75c4ef372.tar.gz |
Add support for handling a bitcode wrapper to librs.
BUG=5425905
Change-Id: I75676060703df6d9043b287fea900c4379455ee2
Diffstat (limited to 'rsScriptC.cpp')
-rw-r--r-- | rsScriptC.cpp | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/rsScriptC.cpp b/rsScriptC.cpp index b45366be..0738106a 100644 --- a/rsScriptC.cpp +++ b/rsScriptC.cpp @@ -21,6 +21,7 @@ #ifndef ANDROID_RS_SERIALIZE #include <bcinfo/BitcodeTranslator.h> +#include <bcinfo/BitcodeWrapper.h> #endif using namespace android; @@ -196,7 +197,24 @@ bool ScriptC::runCompiler(Context *rsc, //LOGE("runCompiler %p %p %p %p %p %i", rsc, this, resName, cacheDir, bitcode, bitcodeLen); #ifndef ANDROID_RS_SERIALIZE - uint32_t sdkVersion = rsc->getTargetSdkVersion(); + uint32_t sdkVersion = 0; + bcinfo::BitcodeWrapper bcWrapper((const char *)bitcode, bitcodeLen); + if (!bcWrapper.unwrap()) { + LOGE("Bitcode is not in proper container format (raw or wrapper)"); + return false; + } + + rsAssert(bcWrapper.getHeaderVersion() == 0); + if (bcWrapper.getBCFileType() == bcinfo::BC_WRAPPER) { + sdkVersion = bcWrapper.getTargetAPI(); + } + + if (sdkVersion == 0) { + // This signals that we didn't have a wrapper containing information + // about the bitcode. + sdkVersion = rsc->getTargetSdkVersion(); + } + if (BT) { delete BT; } |