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
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-07-18 17:26:41 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-07-18 17:26:41 +0300
commit2ccfbf2f81613d44ae853ebcaeaa1af3560a84b6 (patch)
tree1e97a51aa373faad0cb5b3910c1cf717605441cd
parentcf14437ac91975aaf51b50ae6dca7abf7cc997fa (diff)
Cycles: Commit file missing from conditionally compiling baking kernel
-rw-r--r--intern/cycles/kernel/kernels/opencl/kernel.cl8
1 files changed, 1 insertions, 7 deletions
diff --git a/intern/cycles/kernel/kernels/opencl/kernel.cl b/intern/cycles/kernel/kernels/opencl/kernel.cl
index 15fb34cfe3b..57db6fd9098 100644
--- a/intern/cycles/kernel/kernels/opencl/kernel.cl
+++ b/intern/cycles/kernel/kernels/opencl/kernel.cl
@@ -104,13 +104,7 @@ __kernel void kernel_ocl_bake(
int x = sx + get_global_id(0);
if(x < sx + sw) {
-#if defined(__KERNEL_OPENCL_NVIDIA__) && __COMPUTE_CAPABILITY__ < 300
- /* NVidia compiler is spending infinite amount of time trying
- * to deal with kernel_bake_evaluate() on architectures prior
- * to sm_30.
- * For now we disable baking kernel for those devices, so at
- * least rendering with split kernel could be compiled.
- */
+#ifdef __NO_BAKING__
output[x] = make_float4(0.0f, 0.0f, 0.0f, 0.0f);
#else
kernel_bake_evaluate(kg, input, output, (ShaderEvalType)type, x, offset, sample);