summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiao Wang <miaowang@google.com>2015-05-29 18:38:24 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-29 18:38:24 +0000
commit17b89558c305eb8818d97e77f3d00aecf59f4e32 (patch)
tree1985bc05cdea8e26f24ef0d0a44ac8b51e858a3f
parent09c2224337ccf2ea9939ee7f1f5dc8ededfdd4b4 (diff)
parent549f8a500d72edda06f1f1a4986a57aba7f66294 (diff)
downloadrs-17b89558c305eb8818d97e77f3d00aecf59f4e32.tar.gz
Merge "update dispatch table for IntrinsicBLAS" into mnc-dev
-rw-r--r--cpp/rsDispatch.cpp5
-rw-r--r--cpp/rsDispatch.h2
2 files changed, 7 insertions, 0 deletions
diff --git a/cpp/rsDispatch.cpp b/cpp/rsDispatch.cpp
index f09f539b..10adcf28 100644
--- a/cpp/rsDispatch.cpp
+++ b/cpp/rsDispatch.cpp
@@ -411,6 +411,11 @@ bool loadSymbols(void* handle, dispatchTable& dispatchTab, int device_api) {
LOG_API("Couldn't initialize dispatchTab.Allocation3DRead");
return false;
}
+ dispatchTab.ScriptForEachMulti = (ScriptForEachMultiFnPtr)dlsym(handle, "rsScriptForEachMulti");
+ if (dispatchTab.ScriptForEachMulti == NULL) {
+ LOG_API("Couldn't initialize dispatchTab.ScriptForEachMulti");
+ return false;
+ }
}
return true;
diff --git a/cpp/rsDispatch.h b/cpp/rsDispatch.h
index d77a4d97..740457ac 100644
--- a/cpp/rsDispatch.h
+++ b/cpp/rsDispatch.h
@@ -93,6 +93,7 @@ typedef RsScriptGroup2 (*ScriptGroup2CreateFnPtr)(RsContext, const char*, size_t
typedef void (*ScriptGroupSetOutputFnPtr) (RsContext, RsScriptGroup, RsScriptKernelID, RsAllocation);
typedef void (*ScriptGroupSetInputFnPtr) (RsContext, RsScriptGroup, RsScriptKernelID, RsAllocation);
typedef void (*ScriptGroupExecuteFnPtr) (RsContext, RsScriptGroup);
+typedef void (*ScriptForEachMultiFnPtr) (RsContext, RsScript, uint32_t, RsAllocation *, size_t, RsAllocation, const void *, size_t, const RsScriptCall *, size_t);
typedef void (*AllocationIoSendFnPtr) (RsContext, RsAllocation);
typedef void (*AllocationIoReceiveFnPtr) (RsContext, RsAllocation);
typedef void * (*AllocationGetPointerFnPtr) (RsContext, RsAllocation, uint32_t lod, RsAllocationCubemapFace face, uint32_t z, uint32_t array, size_t *stride, size_t stride_len);
@@ -176,6 +177,7 @@ struct dispatchTable {
ScriptGroupSetOutputFnPtr ScriptGroupSetOutput;
ScriptGroupSetInputFnPtr ScriptGroupSetInput;
ScriptGroupExecuteFnPtr ScriptGroupExecute;
+ ScriptForEachMultiFnPtr ScriptForEachMulti;
AllocationIoSendFnPtr AllocationIoSend;
AllocationIoReceiveFnPtr AllocationIoReceive;
AllocationGetPointerFnPtr AllocationGetPointer;