Simplified use of SYCL specialization constants for motion blur curves.

stefanatwork · stefanatwork · commit 787389499ad8 · 2025-10-10T16:08:39.000+02:00
diff --git a/kernels/common/scene_curves.h b/kernels/common/scene_curves.h
@@ -189,9 +189,9 @@ namespace embree
     }
 
     /*! loads curve vertices for specified time */
-    __forceinline void gather_safe(Vec3ff& p0, Vec3ff& p1, Vec3ff& p2, Vec3ff& p3, size_t i, float time) const
+    __forceinline void gather_safe(Vec3ff& p0, Vec3ff& p1, Vec3ff& p2, Vec3ff& p3, size_t i, float time, const bool motion_blur = true) const
     {
-      if (hasMotionBlur()) gather(p0,p1,p2,p3,i,time);
+      if (hasMotionBlur() && motion_blur) gather(p0,p1,p2,p3,i,time);
       else                 gather(p0,p1,p2,p3,i);
     }
     
@@ -218,9 +218,9 @@ namespace embree
     }
 
     /*! loads curve vertices for specified time for mblur and non-mblur case */
-    __forceinline void gather_safe(Vec3ff& p0, Vec3ff& p1, Vec3ff& p2, Vec3ff& p3, Vec3fa& n0, Vec3fa& n1, Vec3fa& n2, Vec3fa& n3, size_t i, float time) const
+    __forceinline void gather_safe(Vec3ff& p0, Vec3ff& p1, Vec3ff& p2, Vec3ff& p3, Vec3fa& n0, Vec3fa& n1, Vec3fa& n2, Vec3fa& n3, size_t i, float time, bool motion_blur = true) const
     {
-      if (hasMotionBlur()) gather(p0,p1,p2,p3,n0,n1,n2,n3,i,time);
+      if (hasMotionBlur() && motion_blur) gather(p0,p1,p2,p3,n0,n1,n2,n3,i,time);
       else                 gather(p0,p1,p2,p3,n0,n1,n2,n3,i);
     }
 
diff --git a/kernels/common/scene_line_segments.h b/kernels/common/scene_line_segments.h
@@ -193,9 +193,9 @@ namespace embree
     }
 
     /*! loads curve vertices for specified time for mblur and non-mblur case */
-    __forceinline void gather_safe(Vec3ff& p0, Vec3ff& p1, unsigned int vid, float time) const
+    __forceinline void gather_safe(Vec3ff& p0, Vec3ff& p1, unsigned int vid, float time, const bool motion_blur = true) const
     {
-      if (hasMotionBlur()) gather(p0,p1,vid,time);
+      if (hasMotionBlur() && motion_blur) gather(p0,p1,vid,time);
       else                 gather(p0,p1,vid);
     }
 
@@ -250,9 +250,9 @@ namespace embree
     }
 
     /*! loads cone curve vertices for specified time for mblur and non-mblur geometry */
-    __forceinline void gather_safe(Vec3ff& p0, Vec3ff& p1, bool& cL, bool& cR, unsigned int primID, size_t vid, float time) const
+    __forceinline void gather_safe(Vec3ff& p0, Vec3ff& p1, bool& cL, bool& cR, unsigned int primID, size_t vid, float time, const bool motion_blur = true) const
     {
-      if (hasMotionBlur()) gather(p0,p1,cL,cR,primID,vid,time);
+      if (hasMotionBlur() && motion_blur) gather(p0,p1,cL,cR,primID,vid,time);
       else                 gather(p0,p1,cL,cR,primID,vid);
     }
 
@@ -335,9 +335,9 @@ namespace embree
     }
 
     /*! loads curve vertices for specified time for mblur and non-mblur geometry */
-    __forceinline void gather_safe(Vec3ff& p0, Vec3ff& p1, Vec3ff& p2, Vec3ff& p3, unsigned int primID, size_t vid, float time) const
+    __forceinline void gather_safe(Vec3ff& p0, Vec3ff& p1, Vec3ff& p2, Vec3ff& p3, unsigned int primID, size_t vid, float time, const bool motion_blur = true) const
     {
-      if (hasMotionBlur()) gather(p0,p1,p2,p3,primID,vid,time);
+      if (hasMotionBlur() && motion_blur) gather(p0,p1,p2,p3,primID,vid,time);
       else                 gather(p0,p1,p2,p3,primID,vid);
     }
 
diff --git a/kernels/sycl/rthwif_embree.cpp b/kernels/sycl/rthwif_embree.cpp
@@ -469,20 +469,20 @@ __forceinline bool intersect_primitive(intel_ray_query_t& query, Ray& ray, Scene
     if (gtype == Geometry::GTY_FLAT_LINEAR_CURVE && (feature_mask & RTC_FEATURE_FLAG_FLAT_LINEAR_CURVE))
     {
       LineSegments* geom = context->scene->get<LineSegments>(geomID);
-      Vec3ff v0, v1; geom->gather_safe(v0,v1,geom->segment(primID),ray.time());
+      Vec3ff v0, v1; geom->gather_safe(v0,v1,geom->segment(primID),ray.time(), feature_mask & RTC_FEATURE_FLAG_MOTION_BLUR);
       return isa::FlatLinearCurveIntersector1<1>::intersect(true,ray,context,geom,pre,v0,v1,Intersect1Epilog1_HWIF<Ray>(ray,context,geomID,primID,filter));
     }
     else if (gtype == Geometry::GTY_ROUND_LINEAR_CURVE && (feature_mask & RTC_FEATURE_FLAG_ROUND_LINEAR_CURVE))
     {
       LineSegments* geom = context->scene->get<LineSegments>(geomID);
-      Vec3ff v0,v1,v2,v3; geom->gather_safe(v0,v1,v2,v3,primID,geom->segment(primID),ray.time());
+      Vec3ff v0,v1,v2,v3; geom->gather_safe(v0,v1,v2,v3,primID,geom->segment(primID),ray.time(), feature_mask & RTC_FEATURE_FLAG_MOTION_BLUR);
       return isa::RoundLinearCurveIntersector1<1>().intersect(true,ray,context,geom,pre,v0,v1,v2,v3,Intersect1Epilog1_HWIF<Ray>(ray,context,geomID,primID,filter));
     }
     else if (gtype == Geometry::GTY_CONE_LINEAR_CURVE && (feature_mask & RTC_FEATURE_FLAG_CONE_LINEAR_CURVE))
     {
       LineSegments* geom = context->scene->get<LineSegments>(geomID);
       Vec3ff v0 = zero, v1 = zero; bool cL = false, cR = false;
-      geom->gather_safe(v0,v1,cL,cR,primID,geom->segment(primID),ray.time());
+      geom->gather_safe(v0,v1,cL,cR,primID,geom->segment(primID),ray.time(), feature_mask & RTC_FEATURE_FLAG_MOTION_BLUR);
       return isa::ConeCurveIntersector1<1>().intersect(true,ray,context,geom,pre,v0,v1,cL,cR,Intersect1Epilog1_HWIF<Ray>(ray,context,geomID,primID,filter));
     }
     else
@@ -516,7 +516,7 @@ __forceinline bool intersect_primitive(intel_ray_query_t& query, Ray& ray, Scene
           if (basis == Geometry::GTY_BASIS_HERMITE && (feature_mask & RTC_FEATURE_FLAG_NORMAL_ORIENTED_HERMITE_CURVE))
             geom->gather_hermite_safe(v0,v1,n0,n1,v2,v3,n2,n3,geom->curve(primID),ray.time());
           else
-            geom->gather_safe(v0,v1,v2,v3,n0,n1,n2,n3,geom->curve(primID),ray.time());
+            geom->gather_safe(v0,v1,v2,v3,n0,n1,n2,n3,geom->curve(primID),ray.time(), feature_mask & RTC_FEATURE_FLAG_MOTION_BLUR);
           isa::convert_to_bezier(gtype, v0,v1,v2,v3, n0,n1,n2,n3);
           return Intersector().intersect(pre,ray,context,geom,primID,v0,v1,v2,v3,n0,n1,n2,n3,Intersect1Epilog1_HWIF<Ray>(ray,context,geomID,primID,filter));
         }
@@ -526,7 +526,7 @@ __forceinline bool intersect_primitive(intel_ray_query_t& query, Ray& ray, Scene
         if (basis == Geometry::GTY_BASIS_HERMITE && (feature_mask & (RTC_FEATURE_FLAG_ROUND_HERMITE_CURVE | RTC_FEATURE_FLAG_FLAT_HERMITE_CURVE)))
           geom->gather_hermite_safe(v0,v1,v2,v3,geom->curve(primID),ray.time());
         else
-          geom->gather_safe(v0,v1,v2,v3,geom->curve(primID),ray.time());
+          geom->gather_safe(v0,v1,v2,v3,geom->curve(primID),ray.time(), feature_mask & RTC_FEATURE_FLAG_MOTION_BLUR);
         
         isa::convert_to_bezier(gtype, v0,v1,v2,v3);
 

Original file line number	Diff line number	Diff line change
`@@ -189,9 +189,9 @@ namespace embree`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`/! loads curve vertices for specified time /`
`192`		`- __forceinline void gather_safe(Vec3ff& p0, Vec3ff& p1, Vec3ff& p2, Vec3ff& p3, size_t i, float time) const`
	`192`	`+ __forceinline void gather_safe(Vec3ff& p0, Vec3ff& p1, Vec3ff& p2, Vec3ff& p3, size_t i, float time, const bool motion_blur = true) const`
`193`	`193`	`{`
`194`		`- if (hasMotionBlur()) gather(p0,p1,p2,p3,i,time);`
	`194`	`+ if (hasMotionBlur() && motion_blur) gather(p0,p1,p2,p3,i,time);`
`195`	`195`	`else gather(p0,p1,p2,p3,i);`
`196`	`196`	`}`
`197`	`197`
`@@ -218,9 +218,9 @@ namespace embree`
`218`	`218`	`}`
`219`	`219`
`220`	`220`	`/! loads curve vertices for specified time for mblur and non-mblur case /`
`221`		`- __forceinline void gather_safe(Vec3ff& p0, Vec3ff& p1, Vec3ff& p2, Vec3ff& p3, Vec3fa& n0, Vec3fa& n1, Vec3fa& n2, Vec3fa& n3, size_t i, float time) const`
	`221`	`+ __forceinline void gather_safe(Vec3ff& p0, Vec3ff& p1, Vec3ff& p2, Vec3ff& p3, Vec3fa& n0, Vec3fa& n1, Vec3fa& n2, Vec3fa& n3, size_t i, float time, bool motion_blur = true) const`
`222`	`222`	`{`
`223`		`- if (hasMotionBlur()) gather(p0,p1,p2,p3,n0,n1,n2,n3,i,time);`
	`223`	`+ if (hasMotionBlur() && motion_blur) gather(p0,p1,p2,p3,n0,n1,n2,n3,i,time);`
`224`	`224`	`else gather(p0,p1,p2,p3,n0,n1,n2,n3,i);`
`225`	`225`	`}`
`226`	`226`
Original file line number	Diff line number	Diff line change
`@@ -193,9 +193,9 @@ namespace embree`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`/! loads curve vertices for specified time for mblur and non-mblur case /`
`196`		`- __forceinline void gather_safe(Vec3ff& p0, Vec3ff& p1, unsigned int vid, float time) const`
	`196`	`+ __forceinline void gather_safe(Vec3ff& p0, Vec3ff& p1, unsigned int vid, float time, const bool motion_blur = true) const`
`197`	`197`	`{`
`198`		`- if (hasMotionBlur()) gather(p0,p1,vid,time);`
	`198`	`+ if (hasMotionBlur() && motion_blur) gather(p0,p1,vid,time);`
`199`	`199`	`else gather(p0,p1,vid);`
`200`	`200`	`}`
`201`	`201`
`@@ -250,9 +250,9 @@ namespace embree`
`250`	`250`	`}`
`251`	`251`
`252`	`252`	`/! loads cone curve vertices for specified time for mblur and non-mblur geometry /`
`253`		`- __forceinline void gather_safe(Vec3ff& p0, Vec3ff& p1, bool& cL, bool& cR, unsigned int primID, size_t vid, float time) const`
	`253`	`+ __forceinline void gather_safe(Vec3ff& p0, Vec3ff& p1, bool& cL, bool& cR, unsigned int primID, size_t vid, float time, const bool motion_blur = true) const`
`254`	`254`	`{`
`255`		`- if (hasMotionBlur()) gather(p0,p1,cL,cR,primID,vid,time);`
	`255`	`+ if (hasMotionBlur() && motion_blur) gather(p0,p1,cL,cR,primID,vid,time);`
`256`	`256`	`else gather(p0,p1,cL,cR,primID,vid);`
`257`	`257`	`}`
`258`	`258`
`@@ -335,9 +335,9 @@ namespace embree`
`335`	`335`	`}`
`336`	`336`
`337`	`337`	`/! loads curve vertices for specified time for mblur and non-mblur geometry /`
`338`		`- __forceinline void gather_safe(Vec3ff& p0, Vec3ff& p1, Vec3ff& p2, Vec3ff& p3, unsigned int primID, size_t vid, float time) const`
	`338`	`+ __forceinline void gather_safe(Vec3ff& p0, Vec3ff& p1, Vec3ff& p2, Vec3ff& p3, unsigned int primID, size_t vid, float time, const bool motion_blur = true) const`
`339`	`339`	`{`
`340`		`- if (hasMotionBlur()) gather(p0,p1,p2,p3,primID,vid,time);`
	`340`	`+ if (hasMotionBlur() && motion_blur) gather(p0,p1,p2,p3,primID,vid,time);`
`341`	`341`	`else gather(p0,p1,p2,p3,primID,vid);`
`342`	`342`	`}`
`343`	`343`
Original file line number	Diff line number	Diff line change
`@@ -469,20 +469,20 @@ __forceinline bool intersect_primitive(intel_ray_query_t& query, Ray& ray, Scene`
`469`	`469`	`if (gtype == Geometry::GTY_FLAT_LINEAR_CURVE && (feature_mask & RTC_FEATURE_FLAG_FLAT_LINEAR_CURVE))`
`470`	`470`	`{`
`471`	`471`	`LineSegments* geom = context->scene->get<LineSegments>(geomID);`
`472`		`- Vec3ff v0, v1; geom->gather_safe(v0,v1,geom->segment(primID),ray.time());`
	`472`	`+ Vec3ff v0, v1; geom->gather_safe(v0,v1,geom->segment(primID),ray.time(), feature_mask & RTC_FEATURE_FLAG_MOTION_BLUR);`
`473`	`473`	`return isa::FlatLinearCurveIntersector1<1>::intersect(true,ray,context,geom,pre,v0,v1,Intersect1Epilog1_HWIF<Ray>(ray,context,geomID,primID,filter));`
`474`	`474`	`}`
`475`	`475`	`else if (gtype == Geometry::GTY_ROUND_LINEAR_CURVE && (feature_mask & RTC_FEATURE_FLAG_ROUND_LINEAR_CURVE))`
`476`	`476`	`{`
`477`	`477`	`LineSegments* geom = context->scene->get<LineSegments>(geomID);`
`478`		`- Vec3ff v0,v1,v2,v3; geom->gather_safe(v0,v1,v2,v3,primID,geom->segment(primID),ray.time());`
	`478`	`+ Vec3ff v0,v1,v2,v3; geom->gather_safe(v0,v1,v2,v3,primID,geom->segment(primID),ray.time(), feature_mask & RTC_FEATURE_FLAG_MOTION_BLUR);`
`479`	`479`	`return isa::RoundLinearCurveIntersector1<1>().intersect(true,ray,context,geom,pre,v0,v1,v2,v3,Intersect1Epilog1_HWIF<Ray>(ray,context,geomID,primID,filter));`
`480`	`480`	`}`
`481`	`481`	`else if (gtype == Geometry::GTY_CONE_LINEAR_CURVE && (feature_mask & RTC_FEATURE_FLAG_CONE_LINEAR_CURVE))`
`482`	`482`	`{`
`483`	`483`	`LineSegments* geom = context->scene->get<LineSegments>(geomID);`
`484`	`484`	`Vec3ff v0 = zero, v1 = zero; bool cL = false, cR = false;`
`485`		`- geom->gather_safe(v0,v1,cL,cR,primID,geom->segment(primID),ray.time());`
	`485`	`+ geom->gather_safe(v0,v1,cL,cR,primID,geom->segment(primID),ray.time(), feature_mask & RTC_FEATURE_FLAG_MOTION_BLUR);`
`486`	`486`	`return isa::ConeCurveIntersector1<1>().intersect(true,ray,context,geom,pre,v0,v1,cL,cR,Intersect1Epilog1_HWIF<Ray>(ray,context,geomID,primID,filter));`
`487`	`487`	`}`
`488`	`488`	`else`
`@@ -516,7 +516,7 @@ __forceinline bool intersect_primitive(intel_ray_query_t& query, Ray& ray, Scene`
`516`	`516`	`if (basis == Geometry::GTY_BASIS_HERMITE && (feature_mask & RTC_FEATURE_FLAG_NORMAL_ORIENTED_HERMITE_CURVE))`
`517`	`517`	`geom->gather_hermite_safe(v0,v1,n0,n1,v2,v3,n2,n3,geom->curve(primID),ray.time());`
`518`	`518`	`else`
`519`		`- geom->gather_safe(v0,v1,v2,v3,n0,n1,n2,n3,geom->curve(primID),ray.time());`
	`519`	`+ geom->gather_safe(v0,v1,v2,v3,n0,n1,n2,n3,geom->curve(primID),ray.time(), feature_mask & RTC_FEATURE_FLAG_MOTION_BLUR);`
`520`	`520`	`isa::convert_to_bezier(gtype, v0,v1,v2,v3, n0,n1,n2,n3);`
`521`	`521`	`return Intersector().intersect(pre,ray,context,geom,primID,v0,v1,v2,v3,n0,n1,n2,n3,Intersect1Epilog1_HWIF<Ray>(ray,context,geomID,primID,filter));`
`522`	`522`	`}`
`@@ -526,7 +526,7 @@ __forceinline bool intersect_primitive(intel_ray_query_t& query, Ray& ray, Scene`
`526`	`526`	`if (basis == Geometry::GTY_BASIS_HERMITE && (feature_mask & (RTC_FEATURE_FLAG_ROUND_HERMITE_CURVE \| RTC_FEATURE_FLAG_FLAT_HERMITE_CURVE)))`
`527`	`527`	`geom->gather_hermite_safe(v0,v1,v2,v3,geom->curve(primID),ray.time());`
`528`	`528`	`else`
`529`		`- geom->gather_safe(v0,v1,v2,v3,geom->curve(primID),ray.time());`
	`529`	`+ geom->gather_safe(v0,v1,v2,v3,geom->curve(primID),ray.time(), feature_mask & RTC_FEATURE_FLAG_MOTION_BLUR);`
`530`	`530`
`531`	`531`	`isa::convert_to_bezier(gtype, v0,v1,v2,v3);`
`532`	`532`