diff options
| author | Yang Ni <yangni@google.com> | 2017-03-23 15:37:07 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-23 15:37:07 +0000 |
| commit | 73f77bca85770f6e6a28dc349863576c61f4c366 (patch) | |
| tree | 03dd14649d58d6b816faa442b67356d9b8005539 /cpu_ref | |
| parent | 6ab7c406cc5f2e28b6686976b350504fc538caaf (diff) | |
| parent | b6bc4300ffcc0307d7097af1ce1459b0f2330f0e (diff) | |
| download | rs-73f77bca85770f6e6a28dc349863576c61f4c366.tar.gz | |
Merge "Removed incorrect asserts" am: 10657f54a0 am: 8607bbce71
am: b6bc4300ff
Change-Id: Iee45b66f9f5472fe0123a5560d9af9f03a220280
Diffstat (limited to 'cpu_ref')
| -rw-r--r-- | cpu_ref/rsCpuScriptGroup.cpp | 4 | ||||
| -rw-r--r-- | cpu_ref/rsCpuScriptGroup2.cpp | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/cpu_ref/rsCpuScriptGroup.cpp b/cpu_ref/rsCpuScriptGroup.cpp index cc2933c1..6a464277 100644 --- a/cpu_ref/rsCpuScriptGroup.cpp +++ b/cpu_ref/rsCpuScriptGroup.cpp @@ -90,8 +90,6 @@ void CpuScriptGroupImpl::scriptGroupRoot(const RsExpandKernelDriverInfo *kinfo, uint32_t ostep; if (sl->outs[ct]) { - rsAssert(kinfo->outLen == 1); - mkinfo->outPtr[0] = (uint8_t *)sl->outs[ct]->mHal.drvState.lod[0].mallocPtr; @@ -108,8 +106,6 @@ void CpuScriptGroupImpl::scriptGroupRoot(const RsExpandKernelDriverInfo *kinfo, sl->outs[ct]->mHal.drvState.lod[0].stride * kinfo->lid; } } else { - rsAssert(kinfo->outLen == 0); - mkinfo->outPtr[0] = nullptr; ostep = 0; } diff --git a/cpu_ref/rsCpuScriptGroup2.cpp b/cpu_ref/rsCpuScriptGroup2.cpp index a8b72c41..e42efe18 100644 --- a/cpu_ref/rsCpuScriptGroup2.cpp +++ b/cpu_ref/rsCpuScriptGroup2.cpp @@ -72,7 +72,6 @@ void groupRoot(const RsExpandKernelDriverInfo *kinfo, uint32_t xstart, ptr += out->mHal.drvState.lod[0].stride * kinfo->current.y; } - rsAssert(kinfo->outLen <= 1); mutable_kinfo->outPtr[0] = const_cast<uint8_t*>(ptr); // The implementation of an intrinsic relies on kinfo->usr being |