diff options
| author | Shih-wei Liao <sliao@google.com> | 2011-01-16 15:41:25 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-16 15:41:25 -0800 |
| commit | 077fd5f6f5853eeecc6805513399dfcebb56cb66 (patch) | |
| tree | 245423e297217fd5827e5bb00f5bba5bcfd9778d /libs/rs | |
| parent | 717143ca79ccccc8565117dfebcf9c6558d34e5b (diff) | |
| parent | 0e7be13973f13dd898003682b80cc48da11792c9 (diff) | |
| download | frameworks_base-077fd5f6f5853eeecc6805513399dfcebb56cb66.zip frameworks_base-077fd5f6f5853eeecc6805513399dfcebb56cb66.tar.gz frameworks_base-077fd5f6f5853eeecc6805513399dfcebb56cb66.tar.bz2 | |
Merge "Fix bug in on-device linking." into honeycomb
Diffstat (limited to 'libs/rs')
| -rw-r--r-- | libs/rs/java/ImageProcessing/src/com/android/rs/image/vertical_blur.rs | 2 | ||||
| -rw-r--r-- | libs/rs/rsScriptC.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libs/rs/java/ImageProcessing/src/com/android/rs/image/vertical_blur.rs b/libs/rs/java/ImageProcessing/src/com/android/rs/image/vertical_blur.rs index aa4cf2d..4615e1f 100644 --- a/libs/rs/java/ImageProcessing/src/com/android/rs/image/vertical_blur.rs +++ b/libs/rs/java/ImageProcessing/src/com/android/rs/image/vertical_blur.rs @@ -56,7 +56,7 @@ void setGamma(float g) { } //sliao -uchar3 convert2uchar3(float3 xyz); +extern uchar3 __attribute__((overloadable)) convert2uchar3(float3 xyz); void root(const void *v_in, void *v_out, const void *usrData, uint32_t x, uint32_t y) { uchar4 *output = (uchar4 *)v_out; diff --git a/libs/rs/rsScriptC.cpp b/libs/rs/rsScriptC.cpp index 0ecb18a..1ab2109 100644 --- a/libs/rs/rsScriptC.cpp +++ b/libs/rs/rsScriptC.cpp @@ -490,7 +490,8 @@ void ScriptCState::runCompiler(Context *rsc, if (bccLinkBC(s->mBccScript, resName, NULL /*rs_runtime_lib_bc*/, - 0 /*rs_runtime_lib_bc_size*/, + 1 /*rs_runtime_lib_bc_size*/ + /*"1" means skip buffer here, and let libbcc decide*/, 0) != 0) { LOGE("bcc: FAILS to link bitcode"); // Handle Fatal Error |