From 5fe854c2b02268c8a4457a98a383d9b9abf2d09c Mon Sep 17 00:00:00 2001 From: Stuart Alldritt Date: Thu, 8 Nov 2018 15:26:02 -0800 Subject: [PATCH 1/2] Fix compile error in OpenCL shader --- kinect2_registration/src/depth_registration.cl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kinect2_registration/src/depth_registration.cl b/kinect2_registration/src/depth_registration.cl index 4011b9ae..ba0c7972 100644 --- a/kinect2_registration/src/depth_registration.cl +++ b/kinect2_registration/src/depth_registration.cl @@ -187,7 +187,7 @@ void kernel remapDepth(global const ushort *in, global ushort *out, global const } const float4 distXY = (float4)((x - xL) * (x - xL), (xH - x) * (xH - x), (y - yL) * (y - yL), (yH - y) * (yH - y)); - const float4 tmp = (float4)(sqrt(2.0)); + const float4 tmp = (float4)(sqrt(2.0f)); const float4 dist2 = (float4)(distXY.s0 + distXY.s2, distXY.s1 + distXY.s2, distXY.s0 + distXY.s3, distXY.s1 + distXY.s3); const float4 dist = select((float4)(0), tmp - sqrt(dist2), valid); const float sum = dist.s0 + dist.s1 + dist.s2 + dist.s3; From 7a09886115520bb8e17ceefd30bb6ec40c58ef88 Mon Sep 17 00:00:00 2001 From: Stuart Alldritt Date: Thu, 11 Apr 2019 13:12:00 -0700 Subject: [PATCH 2/2] Fix a few more floating point compile errors --- kinect2_registration/src/depth_registration.cl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kinect2_registration/src/depth_registration.cl b/kinect2_registration/src/depth_registration.cl index 4011b9ae..57153bb3 100644 --- a/kinect2_registration/src/depth_registration.cl +++ b/kinect2_registration/src/depth_registration.cl @@ -111,7 +111,7 @@ void kernel checkDepth(global const int4 *idx, global const ushort *zImg, global const int4 index = idx[i]; const ushort zI = zImg[i]; - const ushort thres = 0.01 * zI; + const ushort thres = 0.01f * zI; const ushort zIThres = zI + thres; const float4 dist2 = dists[i]; @@ -176,7 +176,7 @@ void kernel remapDepth(global const ushort *in, global ushort *out, global const } const float avg = (p.s0 + p.s1 + p.s2 + p.s3) / count; - const float thres = 0.01 * avg; + const float thres = 0.01f * avg; valid = isless(fabs(p - avg), (float4)(thres)); count = abs(valid.s0 + valid.s1 + valid.s2 + valid.s3); @@ -187,7 +187,7 @@ void kernel remapDepth(global const ushort *in, global ushort *out, global const } const float4 distXY = (float4)((x - xL) * (x - xL), (xH - x) * (xH - x), (y - yL) * (y - yL), (yH - y) * (yH - y)); - const float4 tmp = (float4)(sqrt(2.0)); + const float4 tmp = (float4)(sqrt(2.0f)); const float4 dist2 = (float4)(distXY.s0 + distXY.s2, distXY.s1 + distXY.s2, distXY.s0 + distXY.s3, distXY.s1 + distXY.s3); const float4 dist = select((float4)(0), tmp - sqrt(dist2), valid); const float sum = dist.s0 + dist.s1 + dist.s2 + dist.s3;