diff options
| author | 2012-02-23 09:58:56 -0800 | |
|---|---|---|
| committer | 2012-02-23 09:58:56 -0800 | |
| commit | a16c98c155a51a035719bef5b76e973ee2295795 (patch) | |
| tree | 63d345a1e3eab736b66e7de516ba55783c22b3ab /libs/rs/rsScript.cpp | |
| parent | a172b6e96909186451a6a968b8e70872f6753c10 (diff) | |
| parent | 473a2048d3c54fe38b6f9a58457645c9c472b238 (diff) | |
Merge "Support running ForEach on non-root functions."
Diffstat (limited to 'libs/rs/rsScript.cpp')
| -rw-r--r-- | libs/rs/rsScript.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/rs/rsScript.cpp b/libs/rs/rsScript.cpp index 357dbe32e18e..6a3bd4bf7a08 100644 --- a/libs/rs/rsScript.cpp +++ b/libs/rs/rsScript.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 The Android Open Source Project + * Copyright (C) 2009-2012 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -113,7 +113,7 @@ void rsi_ScriptForEach(Context *rsc, RsScript vs, uint32_t slot, RsAllocation vain, RsAllocation vaout, const void *params, size_t paramLen) { Script *s = static_cast<Script *>(vs); - s->runForEach(rsc, + s->runForEach(rsc, slot, static_cast<const Allocation *>(vain), static_cast<Allocation *>(vaout), params, paramLen); |