diff options
| author | Tim Murray <timmurray@google.com> | 2014-08-19 20:33:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-19 02:43:23 +0000 |
| commit | 265858ca11c9149f280428898914158513eab38e (patch) | |
| tree | 93a7cf37812af21c65e974dd1c0197a2cc9c33a3 /rs/java/android/renderscript/RenderScript.java | |
| parent | 73f84480af851a9f030880849d3686c11f9788ff (diff) | |
| parent | b730d866a0f4f56c103420f818f7f5ec6b8fd618 (diff) | |
Merge "Fix IO_INPUT with 64-bit." into lmp-dev
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; } |