summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorTim Murray <timmurray@google.com>2014-08-19 21:07:42 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-19 21:07:42 +0000
commitd0080ee004e0477cfd51fdab456f4e7f45ed42de (patch)
treeb86f26366cabb8dccdaf68fa1d3306cfbabb675f /rs/java/android/renderscript/RenderScript.java
parent07caa64de754087579ec0b12907906ba3035bdcc (diff)
parent5e8e9c336f9086df349efb29251cfbb4e6915088 (diff)
am 7fa25bc1: am 3c02b020: Merge "Fix IO_INPUT with 64-bit." into lmp-dev
* commit '7fa25bc1269d3ba2db79f32acb17d80194cbadce': Fix IO_INPUT with 64-bit.
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
-rw-r--r--rs/java/android/renderscript/RenderScript.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/rs/java/android/renderscript/RenderScript.java b/rs/java/android/renderscript/RenderScript.java
index 4f3a1a860c10..2ee4ff2c4f69 100644
--- a/rs/java/android/renderscript/RenderScript.java
+++ b/rs/java/android/renderscript/RenderScript.java
@@ -1118,7 +1118,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;
}