[Bf-blender-cvs] [b595a69] master: Cycles: Limit degenerated triangle check got CUDA only

[Sergey Sharybin]

Commit: b595a692c861647f95a39270cf7c123cc830c8c7
Author: Sergey Sharybin
Date:   Tue Jun 7 15:47:39 2016 +0200
Branches: master
https://developer.blender.org/rBb595a692c861647f95a39270cf7c123cc830c8c7

Cycles: Limit degenerated triangle check got CUDA only

OpenCL seems to work fine here, and for some reason that comparison was
giving compilation error on OpenCL here.

Better to compile OpenCL kernel than to be fully robust to weird corner
cases.

===================================================================

M	intern/cycles/kernel/geom/geom_triangle_intersect.h

===================================================================

diff --git a/intern/cycles/kernel/geom/geom_triangle_intersect.h b/intern/cycles/kernel/geom/geom_triangle_intersect.h
index 4e2f46d..b6dfc76 100644
--- a/intern/cycles/kernel/geom/geom_triangle_intersect.h
+++ b/intern/cycles/kernel/geom/geom_triangle_intersect.h
@@ -159,7 +159,7 @@ ccl_device_inline bool triangle_intersect(KernelGlobals *kg,
 	if(kernel_tex_fetch(__prim_visibility, triAddr) & visibility)
 #endif
 	{
-#ifdef __KERNEL_GPU__
+#ifdef __KERNEL_CUDA__
 		if(A == B && B == C) {
 			return false;
 		}