diff options
| author | Yang Ni <yangni@google.com> | 2017-03-22 13:09:41 -0700 |
|---|---|---|
| committer | Yang Ni <yangni@google.com> | 2017-03-22 22:30:23 +0000 |
| commit | ef6acb98982393e36cad52f67e691d75b6a46cfd (patch) | |
| tree | 7d3477aa9518e6b2ef021be1fd80a9ca7ed2449b /cpu_ref | |
| parent | bb820475da6437cdc2d976eac3f23c061934a08e (diff) | |
| download | rs-ef6acb98982393e36cad52f67e691d75b6a46cfd.tar.gz | |
Removed incorrect asserts
Bug: 32278517
RsExpandKernelDriverInfo.outLen is never initialized for any foreach
kernel or a script group. The value does not even apply to a script
group.
There should be no assert on it.
Test: CTS on x86 emulator and checked device logcat no longer has the
asserts in question.
Change-Id: Ib0c25f9978ef5364e8ef0f438243dae14688a634
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 |