Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 077fd5f6 authored by Shih-wei Liao's avatar Shih-wei Liao Committed by Android (Google) Code Review
Browse files

Merge "Fix bug in on-device linking." into honeycomb

parents 717143ca 0e7be139

libs/rs/java/ImageProcessing/src/com/android/rs/image/vertical_blur.rs

+1 −1
Original line number Diff line number Diff line
@@ -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;

libs/rs/rsScriptC.cpp

+2 −1
Original line number Diff line number Diff line
@@ -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