diff options
| author | Miao Wang <miaowang@google.com> | 2015-06-30 23:35:23 -0700 |
|---|---|---|
| committer | Miao Wang <miaowang@google.com> | 2015-06-30 23:35:23 -0700 |
| commit | c02720316d348434ef2ba78030dd8484be0b35f7 (patch) | |
| tree | 39b613ba47c781294fadfdd7b25ed409c3e65d2c /rs/jni/android_renderscript_RenderScript.cpp | |
| parent | ce3b66f542947211ed8ea7e09267bb66ff687a34 (diff) | |
| parent | a1867fb044f9c417510334e0e4f66ae251e840d6 (diff) | |
resolved conflicts for merge of a1867fb0 to mnc-dev-plus-aosp
Change-Id: Id0266c63c98b4cb37f49eb2e0fb9a98cbc7ee1de
Diffstat (limited to 'rs/jni/android_renderscript_RenderScript.cpp')
| -rw-r--r-- | rs/jni/android_renderscript_RenderScript.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rs/jni/android_renderscript_RenderScript.cpp b/rs/jni/android_renderscript_RenderScript.cpp index 26af574f32fe..6a41699fc77e 100644 --- a/rs/jni/android_renderscript_RenderScript.cpp +++ b/rs/jni/android_renderscript_RenderScript.cpp @@ -696,8 +696,8 @@ nScriptIntrinsicBLAS_BNNM(JNIEnv *_env, jobject _this, jlong con, jlong id, jint call.M = M; call.N = N; call.K = K; - call.a_offset = a_offset; - call.b_offset = b_offset; + call.a_offset = a_offset & 0xFF; + call.b_offset = b_offset & 0xFF; call.c_offset = c_offset; call.c_mult_int = c_mult_int; |