Cycles: Commit file missing from conditionally compiling baking kernel
authorSergey Sharybin <sergey.vfx@gmail.com>
Sat, 18 Jul 2015 14:26:41 +0000 (16:26 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sat, 18 Jul 2015 14:26:41 +0000 (16:26 +0200)
intern/cycles/kernel/kernels/opencl/kernel.cl

index 15fb34cfe3bf62f1cf74ecea5be847b8315ac5ff..57db6fd9098a1225f6b6c17dbe279fbc89cd894a 100644 (file)
@@ -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);