Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2018-09-03 16:33:07 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2018-09-03 16:33:07 +0300
commit30a2ad8efedb8513098682a860ebb8b1a54a1eca (patch)
treec711dc58d6f0e9ccee375053acdf5abc85fd1e9a /intern
parent3dee8b4a12f068f3837946a0c2222459385305d3 (diff)
parentc6bbe6c5aac29a4d36eb3aedd488ca4deac68fb7 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/device/opencl/opencl_base.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/intern/cycles/device/opencl/opencl_base.cpp b/intern/cycles/device/opencl/opencl_base.cpp
index 69a2bd7adcb..cc887134bb0 100644
--- a/intern/cycles/device/opencl/opencl_base.cpp
+++ b/intern/cycles/device/opencl/opencl_base.cpp
@@ -1179,8 +1179,13 @@ string OpenCLDeviceBase::kernel_build_options(const string *debug_src)
build_options += "-g -s \"" + *debug_src + "\" ";
}
- if(OpenCLInfo::use_debug())
+ if(info.has_half_images) {
+ build_options += "-D__KERNEL_CL_KHR_FP16__ ";
+ }
+
+ if(OpenCLInfo::use_debug()) {
build_options += "-D__KERNEL_OPENCL_DEBUG__ ";
+ }
#ifdef WITH_CYCLES_DEBUG
build_options += "-D__KERNEL_DEBUG__ ";