summaryrefslogtreecommitdiff
path: root/cpu_ref/rsCpuScript.cpp
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2015-05-22 22:02:10 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-05-22 22:02:10 +0000
commitcee9e9898ed549d00c1fd1c911feff66dbb4225e (patch)
tree3edc752ffebba96ffebc0340876e8348c642ad07 /cpu_ref/rsCpuScript.cpp
parent7bcf1c245d9571fad6d974d02a67419874a2b884 (diff)
parent5aa018cc36e589b07674957714d27ae3d1fa1c4e (diff)
Merge changes from topic 'global_info'
* changes: Update RS driver to support extraction of global variable properties. Use "override" instead of "virtual" when replacing methods.
Diffstat (limited to 'cpu_ref/rsCpuScript.cpp')
-rw-r--r--cpu_ref/rsCpuScript.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/cpu_ref/rsCpuScript.cpp b/cpu_ref/rsCpuScript.cpp
index 37c8db3f..decafc6c 100644
--- a/cpu_ref/rsCpuScript.cpp
+++ b/cpu_ref/rsCpuScript.cpp
@@ -922,6 +922,10 @@ size_t RsdCpuScriptImpl::getGlobalSize(int i) const {
return mScriptExec->getGlobalSize(i);
}
+uint32_t RsdCpuScriptImpl::getGlobalProperties(int i) const {
+ return mScriptExec->getGlobalProperties(i);
+}
+
void RsdCpuScriptImpl::preLaunch(uint32_t slot, const Allocation ** ains,
uint32_t inLen, Allocation * aout,
const void * usr, uint32_t usrLen,