[cl] Fix incorrect filtering of ray max dist in intersection code

achilleasa · Aug 14, 2016 · c21b836 · c21b836
1 parent ba033fa
commit c21b836
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/tracer/opencl/CL/constants.cl b/tracer/opencl/CL/constants.cl
@@ -21,6 +21,6 @@
 
 // Intersection constants
 #define INTERSECTION_EPSILON 0.00001f
-#define INTERSECTION_EPSILON_X2 (INTERSECTION_EPSILON * 2.0f)
+#define INTERSECTION_WITH_LIGHT_EPSILON (INTERSECTION_EPSILON * 1e3f)
 
 #endif
diff --git a/tracer/opencl/CL/kernels/intersect.cl b/tracer/opencl/CL/kernels/intersect.cl
@@ -117,7 +117,7 @@ __kernel void rayIntersectionTest(
 					}
 
 					float t = dot(edge02, qVec) * invDet;
-					if (t > INTERSECTION_EPSILON){
+					if (t > INTERSECTION_EPSILON && t < ray.origin.w){
 						gotHit = 1;
 						stackIndex = -1;
 						break;
@@ -191,9 +191,6 @@ __kernel void rayIntersectionQuery(
 		__global Intersection* intersections
 		){
 
-	Intersection intersection;
-	intersection.wuvt.w = FLT_MAX;
-
 	int globalId = get_global_id(0);
 	if(globalId >= *numRays){
 		return;
@@ -220,6 +217,10 @@ __kernel void rayIntersectionQuery(
 	float3 origRayOrigin = ray.origin.xyz;
 	float3 origRayDir = ray.dir.xyz;
 
+	// Set initial intersection to the ray max dist
+	Intersection intersection;
+	intersection.wuvt.w = ray.origin.w;
+
 	// Setup stack
 	stackIndex = 0;
 	meshBvhStackStartIndex = -1;
@@ -341,7 +342,7 @@ __kernel void rayIntersectionQuery(
 	}
 
 	// Update hit flag
-	hitFlag[globalId] = intersection.wuvt.w < FLT_MAX ? 1 : 0;
+	hitFlag[globalId] = intersection.wuvt.w < ray.origin.w ? 1 : 0;
 	intersections[globalId] = intersection;
 }
 
@@ -359,9 +360,6 @@ __kernel void rayPacketIntersectionQuery(
 		__global Intersection* intersections
 		){
 
-	Intersection intersection;
-	intersection.wuvt.w = FLT_MAX;
-
 	int globalId = get_global_id(0);
 	if (globalId >= *numRays){
 		return;
@@ -391,6 +389,10 @@ __kernel void rayPacketIntersectionQuery(
 	float3 origRayOrigin = ray.origin.xyz;
 	float3 origRayDir = ray.dir.xyz;
 
+	// Set initial intersection to the ray max dist
+	Intersection intersection;
+	intersection.wuvt.w = ray.origin.w;
+
 	// Traversal preferences
 	int packetWantsLeft, packetWantsRight;
 
@@ -568,7 +570,7 @@ __kernel void rayPacketIntersectionQuery(
 	}
 
 	// Update hit flag
-	hitFlag[globalId] = intersection.wuvt.w < FLT_MAX ? 1 : 0;
+	hitFlag[globalId] = intersection.wuvt.w < ray.origin.w ? 1 : 0;
 	intersections[globalId] = intersection;
 }