Commit 579781e3 authored by Alexander Alekhin's avatar Alexander Alekhin

Merge pull request #10822 from alalek:ocl_fix_imgproc_amd

parents 66f3c1ae fad3a6bf
...@@ -558,6 +558,7 @@ static bool ocl_Laplacian5(InputArray _src, OutputArray _dst, ...@@ -558,6 +558,7 @@ static bool ocl_Laplacian5(InputArray _src, OutputArray _dst,
) && ) &&
(tileSizeX * tileSizeYmin <= wgs) && (tileSizeX * tileSizeYmin <= wgs) &&
(LAPLACIAN_LOCAL_MEM(tileSizeX, tileSizeYmin, kernelX.cols, loc_mem_cn * 4) <= lmsz) (LAPLACIAN_LOCAL_MEM(tileSizeX, tileSizeYmin, kernelX.cols, loc_mem_cn * 4) <= lmsz)
&& OCL_PERFORMANCE_CHECK(!dev.isAMD()) // TODO FIXIT 2018: Problem with AMDGPU on Linux (2482.3)
) )
{ {
Size size = _src.size(), wholeSize; Size size = _src.size(), wholeSize;
......
...@@ -4391,7 +4391,7 @@ bool ocl_sepFilter2D( InputArray _src, OutputArray _dst, int ddepth, ...@@ -4391,7 +4391,7 @@ bool ocl_sepFilter2D( InputArray _src, OutputArray _dst, int ddepth,
imgSize.height > optimizedSepFilterLocalHeight + anchor.y && imgSize.height > optimizedSepFilterLocalHeight + anchor.y &&
(!(borderType & BORDER_ISOLATED) || _src.offset() == 0) && (!(borderType & BORDER_ISOLATED) || _src.offset() == 0) &&
anchor == Point(kernelX.cols >> 1, kernelY.cols >> 1) && anchor == Point(kernelX.cols >> 1, kernelY.cols >> 1) &&
(d.isIntel() || (d.isAMD() && !d.hostUnifiedMemory())), OCL_PERFORMANCE_CHECK(d.isIntel()), // TODO FIXIT
ocl_sepFilter2D_SinglePass(_src, _dst, kernelX, kernelY, delta, ocl_sepFilter2D_SinglePass(_src, _dst, kernelX, kernelY, delta,
borderType & ~BORDER_ISOLATED, ddepth, bdepth, int_arithm), true) borderType & ~BORDER_ISOLATED, ddepth, bdepth, int_arithm), true)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment