diff options
| author | Yang Ni <yangni@google.com> | 2017-03-23 15:31:37 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-23 15:31:37 +0000 |
| commit | 8607bbce715dfed7010879f69b115e8db8b96d7a (patch) | |
| tree | 8f8e9964a8d4ebf7dcce86ab3aff5823b64dd9c1 | |
| parent | 5697000fb44ae5c0f711c6e77ad5d20591b1b457 (diff) | |
| parent | 10657f54a0119769ea1156b540ad765ed977072d (diff) | |
| download | rs-8607bbce715dfed7010879f69b115e8db8b96d7a.tar.gz | |
Merge "Removed incorrect asserts"
am: 10657f54a0
Change-Id: I17e9237b8d7284b8271323b17cc3ecee8f56bf3c
| -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 |