integrate film refactor + kernelabstractions

Author: SimonDanisch

docs/code/TraceMakie.jl

@@ -32,6 +32,17 @@ macro real_assert(expr, msg="")
     end
 end
 
+const ENABLE_INBOUNDS = true
+
+macro _inbounds(ex)
+    if ENABLE_INBOUNDS
+        esc(:(@inbounds $ex))
+    else
+        esc(ex)
+    end
+end
+
+
 # GeometryBasics.@fixed_vector Normal StaticVector
 include("typeNormal3f.jl")
 include("mempool.jl")

src/Trace.jl

@@ -243,9 +243,9 @@ end
     to_visit_offset, current_node_i = Int32(1), Int32(1)
     nodes_to_visit = zeros(MVector{64,Int32})
     primitives = bvh.primitives
-    @inbounds primitive = primitives[1]
+    @_inbounds primitive = primitives[1]
     nodes = bvh.nodes
-    @inbounds while true
+    @_inbounds while true
         ln = nodes[current_node_i]
         if intersect_p(ln.bounds, ray, inv_dir, dir_is_neg)
             if !ln.is_interior && ln.n_primitives > Int32(0)
@@ -295,7 +295,7 @@ end
     to_visit_offset, current_node_i = Int32(1), Int32(1)
     nodes_to_visit = zeros(MVector{64,Int32})
     primitives = bvh.primitives
-    @inbounds while true
+    @_inbounds while true
         ln = bvh.nodes[current_node_i]
         if intersect_p(ln.bounds, ray, inv_dir, dir_is_neg)
             if !ln.is_interior && ln.n_primitives > Int32(0)

src/accel/bvh.jl

@@ -154,7 +154,7 @@ end
 
 function intersect(b::Bounds3, ray::AbstractRay)::Tuple{Bool,Float32,Float32}
     t0, t1 = 0f0, ray.t_max
-    @inbounds for i in 1:3
+    @_inbounds for i in 1:3
         # Update interval for i-th bbox slab.
         inv_ray_dir = 1f0 / ray.d[i]
         t_near = (b.p_min[i] - ray.o[i]) * inv_ray_dir
@@ -171,7 +171,7 @@ function intersect(b::Bounds3, ray::AbstractRay)::Tuple{Bool,Float32,Float32}
 end
 
 @inline function is_dir_negative(dir::Vec3f)
-    @inbounds Point3{UInt8}(
+    @_inbounds Point3{UInt8}(
         dir[1] < 0 ? 2 : 1,
         dir[2] < 0 ? 2 : 1,
         dir[3] < 0 ? 2 : 1,
@@ -185,7 +185,7 @@ dir_is_negative: 1 -- false, 2 -- true
         b::Bounds3, ray::AbstractRay,
         inv_dir::Vec3f, dir_is_negative::Point3{UInt8},
     )::Bool
-    @inbounds begin
+    @_inbounds begin
         tx_min = (b[dir_is_negative[1]][1] - ray.o[1]) * inv_dir[1]
         tx_max = (b[3-dir_is_negative[1]][1] - ray.o[1]) * inv_dir[1]
         ty_min = (b[dir_is_negative[2]][2] - ray.o[2]) * inv_dir[2]