mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-06 06:26:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #12620 from alalek:ocl_extra_build_options

Browse Source
This commit is contained in:
Alexander Alekhin 2018-10-01 15:57:31 +00:00
commit 682180e0cd
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
modules/core/src/ocl.cpp
View File

@ -238,6 +238,20 @@ static const bool CV_OPENCL_DISABLE_BUFFER_RECT_OPERATIONS = utils::getConfigura
#endif #endif
); );
static const String getBuildExtraOptions()
{
static String param_buildExtraOptions;
static bool initialized = false;
if (!initialized)
{
param_buildExtraOptions = utils::getConfigurationParameterString("OPENCV_OPENCL_BUILD_EXTRA_OPTIONS", "");
initialized = true;
if (!param_buildExtraOptions.empty())
CV_LOG_WARNING(NULL, "OpenCL: using extra build options: '" << param_buildExtraOptions << "'");
}
return param_buildExtraOptions;
}
#endif // HAVE_OPENCL #endif // HAVE_OPENCL
struct UMat2D struct UMat2D
@ -3522,6 +3536,9 @@ struct Program::Impl
buildflags = joinBuildOptions(buildflags, " -D AMD_DEVICE"); buildflags = joinBuildOptions(buildflags, " -D AMD_DEVICE");
else if (device.isIntel()) else if (device.isIntel())
buildflags = joinBuildOptions(buildflags, " -D INTEL_DEVICE"); buildflags = joinBuildOptions(buildflags, " -D INTEL_DEVICE");
const String param_buildExtraOptions = getBuildExtraOptions();
if (!param_buildExtraOptions.empty())
buildflags = joinBuildOptions(buildflags, param_buildExtraOptions);
} }
compile(ctx, src_, errmsg); compile(ctx, src_, errmsg);
} }