summaryrefslogtreecommitdiffstats
path: root/libs/rs
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2011-02-07 13:47:21 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-02-07 13:47:21 -0800
commit74d077822954ef3db44c11bb670d4894f30d524f (patch)
treea617d38f94c92bd97b83d197c58ab4146f1f9ed3 /libs/rs
parentf7398e2808675d134460196054397237c502891a (diff)
parent95dc232c0a16c64e422ef7e57e14e5f955b112a2 (diff)
downloadframeworks_base-74d077822954ef3db44c11bb670d4894f30d524f.zip
frameworks_base-74d077822954ef3db44c11bb670d4894f30d524f.tar.gz
frameworks_base-74d077822954ef3db44c11bb670d4894f30d524f.tar.bz2
am 95dc232c: am a5b8768f: Merge "Add support for memcpy/memset to RS." into honeycomb
* commit '95dc232c0a16c64e422ef7e57e14e5f955b112a2': Add support for memcpy/memset to RS.
Diffstat (limited to 'libs/rs')
-rw-r--r--libs/rs/rsScriptC_Lib.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/libs/rs/rsScriptC_Lib.cpp b/libs/rs/rsScriptC_Lib.cpp
index 8a85f6e..80da8ae 100644
--- a/libs/rs/rsScriptC_Lib.cpp
+++ b/libs/rs/rsScriptC_Lib.cpp
@@ -856,6 +856,8 @@ static ScriptCState::SymbolTable_t gSyms[] = {
{ "__modsi3", (void *)&SC_modsi3, true },
{ "__udivsi3", (void *)&SC_udivsi3, true },
{ "__umodsi3", (void *)&SC_umodsi3, true },
+ { "memset", (void *)&memset, true },
+ { "memcpy", (void *)&memcpy, true },
// allocation
{ "_Z19rsAllocationGetDimX13rs_allocation", (void *)&SC_allocGetDimX, true },