diff options
| author | Jason Sams <rjsams@android.com> | 2011-07-13 12:28:38 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-13 12:28:38 -0700 |
| commit | 3ac60ada279e2cd24001c0f084982b7e14532ea6 (patch) | |
| tree | cdc31fd7963d52e73c3e5ab6e88e62bc238a79ff /libs/rs | |
| parent | 67d464f47e842d5069e993408fd51ec122ad8019 (diff) | |
| parent | 92b0eab07e0ec653975dd940f4af3ceeb68ad3a8 (diff) | |
| download | frameworks_base-3ac60ada279e2cd24001c0f084982b7e14532ea6.zip frameworks_base-3ac60ada279e2cd24001c0f084982b7e14532ea6.tar.gz frameworks_base-3ac60ada279e2cd24001c0f084982b7e14532ea6.tar.bz2 | |
Merge "Add slot number to forEach hal."
Diffstat (limited to 'libs/rs')
| -rw-r--r-- | libs/rs/driver/rsdBcc.cpp | 1 | ||||
| -rw-r--r-- | libs/rs/driver/rsdBcc.h | 1 | ||||
| -rw-r--r-- | libs/rs/rsScriptC.cpp | 2 | ||||
| -rw-r--r-- | libs/rs/rs_hal.h | 1 |
4 files changed, 4 insertions, 1 deletions
diff --git a/libs/rs/driver/rsdBcc.cpp b/libs/rs/driver/rsdBcc.cpp index 62eb24e..bbf2836 100644 --- a/libs/rs/driver/rsdBcc.cpp +++ b/libs/rs/driver/rsdBcc.cpp @@ -269,6 +269,7 @@ static void wc_x(void *usr, uint32_t idx) { void rsdScriptInvokeForEach(const Context *rsc, Script *s, + uint32_t slot, const Allocation * ain, Allocation * aout, const void * usr, diff --git a/libs/rs/driver/rsdBcc.h b/libs/rs/driver/rsdBcc.h index 62b50f4..67929bc 100644 --- a/libs/rs/driver/rsdBcc.h +++ b/libs/rs/driver/rsdBcc.h @@ -32,6 +32,7 @@ void rsdScriptInvokeFunction(const android::renderscript::Context *dc, void rsdScriptInvokeForEach(const android::renderscript::Context *rsc, android::renderscript::Script *s, + uint32_t slot, const android::renderscript::Allocation * ain, android::renderscript::Allocation * aout, const void * usr, diff --git a/libs/rs/rsScriptC.cpp b/libs/rs/rsScriptC.cpp index b230bb5..e8b1014 100644 --- a/libs/rs/rsScriptC.cpp +++ b/libs/rs/rsScriptC.cpp @@ -121,7 +121,7 @@ void ScriptC::runForEach(Context *rsc, setupGLState(rsc); setupScript(rsc); - rsc->mHal.funcs.script.invokeForEach(rsc, this, ain, aout, usr, usrBytes, sc); + rsc->mHal.funcs.script.invokeForEach(rsc, this, 0, ain, aout, usr, usrBytes, sc); } void ScriptC::Invoke(Context *rsc, uint32_t slot, const void *data, size_t len) { diff --git a/libs/rs/rs_hal.h b/libs/rs/rs_hal.h index 928dca5..6a4537b 100644 --- a/libs/rs/rs_hal.h +++ b/libs/rs/rs_hal.h @@ -70,6 +70,7 @@ typedef struct { int (*invokeRoot)(const Context *rsc, Script *s); void (*invokeForEach)(const Context *rsc, Script *s, + uint32_t slot, const Allocation * ain, Allocation * aout, const void * usr, |