From 0e7be13973f13dd898003682b80cc48da11792c9 Mon Sep 17 00:00:00 2001 From: Shih-wei Liao Date: Sun, 16 Jan 2011 15:38:13 -0800 Subject: [PATCH] Fix bug in on-device linking. Change-Id: Ic027d4cbf240a45da95a024067215a572c3bd7a9 --- .../ImageProcessing/src/com/android/rs/image/vertical_blur.rs | 2 +- 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 aa4cf2d90597a..4615e1fba4e45 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 0ecb18a28d885..1ab2109505255 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