diff options
| author | Tim Murray <timmurray@google.com> | 2014-08-19 20:39:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-19 20:39:01 +0000 |
| commit | 5e8e9c336f9086df349efb29251cfbb4e6915088 (patch) | |
| tree | 8b89e000267f5bfe86fd5e22bb98e3f50a75f3b5 /rs/java/android/renderscript/RenderScript.java | |
| parent | 3f5b887cba9f4e2360ad45aeb0bd23af61f8caa1 (diff) | |
| parent | 265858ca11c9149f280428898914158513eab38e (diff) | |
am 3c02b020: Merge "Fix IO_INPUT with 64-bit." into lmp-dev
* commit '3c02b0201c4e57bb493a926ee79aaf80fbd1ff7b':
Fix IO_INPUT with 64-bit.
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
| -rw-r--r-- | rs/java/android/renderscript/RenderScript.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/rs/java/android/renderscript/RenderScript.java b/rs/java/android/renderscript/RenderScript.java index 340efef875a3..6c5c5083edca 100644 --- a/rs/java/android/renderscript/RenderScript.java +++ b/rs/java/android/renderscript/RenderScript.java @@ -1156,7 +1156,12 @@ public class RenderScript { } if (msg == RS_MESSAGE_TO_CLIENT_NEW_BUFFER) { - Allocation.sendBufferNotification(subID); + if (mRS.nContextGetUserMessage(mRS.mContext, rbuf) != + RS_MESSAGE_TO_CLIENT_NEW_BUFFER) { + throw new RSDriverException("Error processing message from RenderScript."); + } + long bufferID = ((long)rbuf[1] << 32L) + ((long)rbuf[0] & 0xffffffffL); + Allocation.sendBufferNotification(bufferID); continue; } |