[Bf-blender-cvs] [27248c8636] master: Cycles: Remove unused macro

Sergey Sharybin noreply at git.blender.org
Thu Mar 23 18:05:23 CET 2017


Commit: 27248c8636ab8a6fa1e082ce9bc9bbdb09174358
Author: Sergey Sharybin
Date:   Thu Mar 23 17:59:02 2017 +0100
Branches: master
https://developer.blender.org/rB27248c8636ab8a6fa1e082ce9bc9bbdb09174358

Cycles: Remove unused macro

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

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 313121104f..584d0b3508 100644
--- a/intern/cycles/kernel/geom/geom_triangle_intersect.h
+++ b/intern/cycles/kernel/geom/geom_triangle_intersect.h
@@ -22,16 +22,6 @@
 
 CCL_NAMESPACE_BEGIN
 
-/* Workaround stupidness of CUDA/OpenCL which doesn't allow to access indexed
- * component of float3 value.
- */
-#ifndef __KERNEL_CPU__
-#  define IDX(vec, idx) \
-    ((idx == 0) ? ((vec).x) : ( (idx == 1) ? ((vec).y) : ((vec).z) ))
-#else
-#  define IDX(vec, idx) ((vec)[idx])
-#endif
-
 /* Ray-Triangle intersection for BVH traversal
  *
  * Sven Woop
@@ -309,6 +299,4 @@ ccl_device_inline float3 triangle_refine_subsurface(KernelGlobals *kg,
 	return P;
 }
 
-#undef IDX
-
 CCL_NAMESPACE_END




More information about the Bf-blender-cvs mailing list