get film tile to work with KernelAbstraction

Author: SimonDanisch

docs/code/TraceMakie.jl

@@ -1,5 +1,6 @@
 using Makie, Trace, ImageShow, Colors, FileIO, LinearAlgebra, GeometryBasics
-using AMDGPU
+using AMDGPU, GLMakie
+
 ArrayType = ROCArray
 
 function to_spectrum(data::Colorant)
@@ -123,19 +124,17 @@ end
 
 function to_trace_camera(scene::Makie.Scene, film)
     cc = scene.camera_controls
-    fov = cc.fov[]
-    view = Trace.look_at(
-        Point3f(cc.eyeposition[]), Point3f(cc.lookat[]), Vec3f(cc.upvector[]),
-    )
-    return Trace.PerspectiveCamera(
-        view, Trace.Bounds2(Point2f(-1.0f0), Point2f(1.0f0)),
-        0.0f0, 1.0f0, 0.0f0, 1.0f6, Float32(fov),
-        film
-    )
-end
-
-function render_scene(scene::Makie.Scene)
-    return render_scene(c -> Trace.WhittedIntegrator(c, Trace.UniformSampler(8), 5), scene)
+    return lift(scene, cc.eyeposition, cc.lookat, cc.upvector, cc.fov) do eyeposition, lookat, upvector, fov
+        view = Trace.look_at(
+            Point3f(eyeposition), Point3f(lookat), Vec3f(upvector),
+        )
+        return Trace.PerspectiveCamera(
+            view, Trace.Bounds2(Point2f(-1.0f0), Point2f(1.0f0)),
+            0.0f0, 1.0f0, 0.0f0, 1.0f6, Float32(fov),
+            film
+        )
+    end
+    return
 end
 
 function convert_scene(scene::Makie.Scene)
@@ -170,7 +169,14 @@ end
 
 function render_whitted(mscene::Makie.Scene; samples_per_pixel=8, max_depth=5)
     scene, camera, film = convert_scene(mscene)
-    integrator = Trace.WhittedIntegrator(camera, Trace.UniformSampler(samples_per_pixel), max_depth)
+    integrator = Trace.WhittedIntegrator(camera[], Trace.UniformSampler(samples_per_pixel), max_depth)
+    integrator(scene, film)
+    return reverse(film.framebuffer, dims=1)
+end
+
+function render_sppm(mscene::Makie.Scene; search_radius=0.075f0, max_depth=5, iterations=100)
+    scene, camera, film = convert_scene(mscene)
+    integrator = Trace.SPPMIntegrator(camera[], search_radius, max_depth, iterations, film)
     integrator(scene, film)
     return reverse(film.framebuffer, dims=1)
 end
@@ -182,41 +188,57 @@ function render_gpu(mscene::Makie.Scene, ArrayType; samples_per_pixel=8, max_dep
     res = Int.((film.resolution...,))
     gpu_img = ArrayType(zeros(RGBf, res))
     GC.@preserve preserve begin
-        Trace.launch_trace_image!(gpu_img, camera, gpu_scene, Int32(samples_per_pixel), Int32(max_depth))
+        Trace.launch_trace_image!(gpu_img, camera[], gpu_scene, Int32(samples_per_pixel), Int32(max_depth), Int32(0))
     end
     return Array(gpu_img)
 end
 
-glass = Trace.GlassMaterial(
-    Trace.ConstantTexture(Trace.RGBSpectrum(1.0f0)),
-    Trace.ConstantTexture(Trace.RGBSpectrum(1.0f0)),
-    Trace.ConstantTexture(0.0f0),
-    Trace.ConstantTexture(0.0f0),
-    Trace.ConstantTexture(1.25f0),
-    true,
-)
-mirror = Trace.MirrorMaterial(Trace.ConstantTexture(Trace.RGBSpectrum(1.0f0)))
-plastic = Trace.PlasticMaterial(
-    Trace.ConstantTexture(Trace.RGBSpectrum(0.6399999857f0, 0.6399999857f0, 0.6399999857f0)),
-    Trace.ConstantTexture(Trace.RGBSpectrum(0.1000000015f0, 0.1000000015f0, 0.1000000015f0)),
-    Trace.ConstantTexture(0.010408001f0),
-    true,
-)
-catmesh = load(Makie.assetpath("cat.obj"))
+function render(w::Whitten5, scene)
+
+end
+
+function render_interactive(mscene::Makie.Scene, ArrayType; max_depth=5)
+    scene, camera, film = convert_scene(mscene)
+    preserve = []
+    gpu_scene = Trace.to_gpu(ArrayType, scene; preserve=preserve)
+    res = Int.((film.resolution...,))
+    gpu_img = ArrayType(zeros(RGBf, res))
+    s = Scene(size=res)
+    imgp = image!(s, -1..1, -1..1, Array(gpu_img))
+    display(GLMakie.Screen(), mscene)
+    display(GLMakie.Screen(), s)
+    cam_start = camera[]
+    n_iter = Int32(1)
+    Base.errormonitor(@async while isopen(s)
+        GC.@preserve preserve begin
+            if cam_start != camera[]
+                cam_start = camera[]
+                gpu_img .= RGBf(0, 0, 0)
+            end
+            Trace.launch_trace_image!(gpu_img, camera[], gpu_scene, Int32(1), Int32(max_depth), n_iter)
+            n_iter += Int32(1)
+        end
+        imgp[3] = Array(gpu_img)
+        sleep(1/10)
+    end)
+    return Array(gpu_img)
+end
 
 begin
+    catmesh = load(Makie.assetpath("cat.obj"))
     scene = Scene(size=(1024, 1024);
         lights=[AmbientLight(RGBf(0.7, 0.6, 0.6)), PointLight(Vec3f(0, 1, 0.5), RGBf(1.3, 1.3, 1.3))]
     )
     cam3d!(scene)
     mesh!(scene, catmesh, color=load(Makie.assetpath("diffusemap.png")))
     center!(scene)
-    @time render_whitted(scene)
+    # @time render_whitted(scene)
     # 1.024328 seconds (16.94 M allocations: 5.108 GiB, 46.19% gc time, 81 lock conflicts)
     # 0.913530 seconds (16.93 M allocations: 5.108 GiB, 42.52% gc time, 57 lock conflicts)
     # 0.416158 seconds (75.58 k allocations: 88.646 MiB, 2.44% gc time, 16 lock conflicts)
     @time render_gpu(scene, ArrayType)
     # 0.135438 seconds (76.03 k allocations: 82.406 MiB, 8.57% gc time)
+    # render_interactive(scene, ArrayType; max_depth=5)
 end
 
 begin
@@ -236,24 +258,31 @@ begin
     # 0.976180 seconds (443.12 k allocations: 107.841 MiB, 6.60% gc time, 12 lock conflicts)
     @time render_gpu(scene, ArrayType)
     # 0.236231 seconds (443.48 k allocations: 101.598 MiB, 3.92% gc time)
+    # render_interactive(scene, ArrayType; max_depth=5)
 end
 
-model = load(joinpath(@__DIR__, "..", "src", "assets", "models", "caustic-glass.ply"))
 begin
+    model = load(joinpath(@__DIR__, "..", "src", "assets", "models", "caustic-glass.ply"))
     glass = Trace.GlassMaterial(
-        Trace.ConstantTexture(Trace.RGBSpectrum(1.0f0)),
-        Trace.ConstantTexture(Trace.RGBSpectrum(1.0f0)),
+        Trace.ConstantTexture(Trace.RGBSpectrum(0.9f0)),
+        Trace.ConstantTexture(Trace.RGBSpectrum(0.88f0)),
         Trace.ConstantTexture(0.0f0),
         Trace.ConstantTexture(0.0f0),
-        Trace.ConstantTexture(1.25f0),
+        Trace.ConstantTexture(1.4f0),
         true,
     )
     plastic = Trace.PlasticMaterial(
-        Trace.ConstantTexture(Trace.RGBSpectrum(0.6399999857f0, 0.6399999857f0, 0.6399999857f0)),
+        Trace.ConstantTexture(Trace.RGBSpectrum(0.6399999857f0, 0.6399999857f0, 0.5399999857f0)),
         Trace.ConstantTexture(Trace.RGBSpectrum(0.1000000015f0, 0.1000000015f0, 0.1000000015f0)),
         Trace.ConstantTexture(0.010408001f0),
         true,
     )
+    plastic_ceil = Trace.PlasticMaterial(
+        Trace.ConstantTexture(Trace.RGBSpectrum(0.3399999857f0, 0.6399999857f0, 0.8399999857f0)),
+        Trace.ConstantTexture(Trace.RGBSpectrum(1.4f0)),
+        Trace.ConstantTexture(0.000408001f0),
+        true,
+    )
     scene = Scene(size=(1024, 1024); lights=[
         AmbientLight(RGBf(1, 1, 1)),
         PointLight(Vec3f(4, 4, 10), RGBf(150, 150, 150)),
@@ -265,12 +294,30 @@ begin
     mesh!(scene, model, material=glass)
     mini, maxi = extrema(Rect3f(decompose(Point, model)))
     floorrect = Rect3f(Vec3f(-10, mini[2], -10), Vec3f(20, -1, 20))
-    mesh!(scene, floorrect, material=plastic)
+    mesh!(scene, floorrect, material=plastic_ceil)
+    ceiling = Rect3f(Vec3f(-25, 11, -25), Vec3f(50, -1, 50))
+    mesh!(scene, ceiling, material=plastic)
     center!(scene)
     update_cam!(scene, Vec3f(-1.6, 6.2, 0.2), Vec3f(-3.6, 2.5, 2.4), Vec3f(0, 1, 0))
 
     @time render_whitted(scene)
     # 9.820304 seconds (1.69 M allocations: 235.165 MiB, 0.51% gc time, 3 lock conflicts)
-    @time render_gpu(scene, ArrayType)
+    # @time render_gpu(scene, ArrayType)
     # 6.128600 seconds (1.70 M allocations: 228.875 MiB, 1.09% gc time)
+    # @time render_sppm(scene; iterations=500)
+    # @time colorbuffer(scene; backend=RPRMakie)
+    # 6.321123 seconds (10.09 k allocations: 66.559 MiB, 0.15% gc time)
+    # render_interactive(scene, ArrayType; max_depth=5)
 end
+
+@time begin
+    tscene, tcamera, tfilm = convert_scene(scene)
+    w = Whitten5(tfilm; samples_per_pixel=8)
+end;
+begin
+    @time launch_trace_image!(w, tcamera[], tscene)
+    Trace.to_framebuffer!(tfilm, 1.0f0)
+    tfilm.framebuffer
+end
+
+# img = render_sppm(scene; iterations=1)

docs/code/basic-scene.jl

@@ -70,11 +70,21 @@ begin
     )
 end
 
-begin
-    integrator = Trace.WhittedIntegrator(cam, Trace.UniformSampler(8), 5)
-    @time integrator(scene, film)
-    img = reverse(film.framebuffer, dims=1)
-end
+# begin
+#     Trace.clear!(film)
+#     integrator = Trace.WhittedIntegrator(cam, Trace.UniformSampler(8), 5)
+#     @time integrator(scene, film)
+#     img = reverse(film.framebuffer, dims=1)
+# end
+
+# begin
+#     resolution = Point2f(1024)
+#     Trace.clear!(film)
+#     @time render_scene(scene, film, cam)
+#     Trace.to_framebuffer!(film, 1.0f0)
+#     film.framebuffer
+# end
+
 
 # 6.296157 seconds (17.64 k allocations: 19.796 MiB, 0.13% gc time, 45 lock conflicts)
 # After more GPU optimizations

docs/code/rpr-comparison.jl

@@ -0,0 +1,53 @@
+using RPRMakie
+
+function Plastic(; kw...)
+    return (type=:Uber,
+        color=to_color(:yellow), reflection_color=Vec4f(1),
+        reflection_weight=Vec4f(1), reflection_roughness=Vec4f(0),
+        reflection_anisotropy=Vec4f(0), reflection_anisotropy_rotation=Vec4f(0),
+        reflection_metalness=Vec4f(0), reflection_ior=Vec4f(1.5), refraction_weight=Vec4f(0),
+        coating_weight=Vec4f(0), sheen_weight=Vec4f(0), emission_weight=Vec3f(0),
+        transparency=Vec4f(0), reflection_mode=UInt(RPR.RPR_UBER_MATERIAL_IOR_MODE_PBR),
+        emission_mode=UInt(RPR.RPR_UBER_MATERIAL_EMISSION_MODE_SINGLESIDED),
+        coating_mode=UInt(RPR.RPR_UBER_MATERIAL_IOR_MODE_PBR), sss_multiscatter=false,
+        refraction_thin_surface=false, kw...
+    )
+end
+
+function Glass(; kw...)
+    return (type=:Uber,
+        reflection_color=Vec4f(0.9), reflection_weight=Vec4f(1.0),
+        reflection_roughness=Vec4f(0.0), reflection_anisotropy=Vec4f(0.0),
+        reflection_anisotropy_rotation=Vec4f(0.0), reflection_mode=1,
+        reflection_ior=Vec4f(1.5), refraction_color=Vec4f(0.9), refraction_weight=Vec4f(1.0),
+        refraction_roughness=Vec4f(0.0), refraction_ior=Vec4f(1.5),
+        refraction_thin_surface=false, refraction_absorption_color=Vec4f(0.6, 0.8, 0.6, 0.0),
+        refraction_absorption_distance=Vec4f(150), refraction_caustics=true,
+        coating_weight=Vec4f(0), sheen_weight=Vec4f(0), emission_weight=Vec4f(0),
+        transparency=Vec4f(0), kw...
+    )
+end
+begin
+    glass = Glass(color=RGBf(0.8f0, 0.2f0, 0.2f0))
+    plastic = Plastic(color=RGBf(0.9f0, 0.9f0, 0.9f0), reflection_ior=1.2, reflection_roughness=0.1)
+    plastic_ceil = Plastic(color=RGBf(0.33, 0.63, 0.83))
+    radiance = 500
+    scene = Scene(size=(1024, 1024); lights=[
+        AmbientLight(RGBf(0.6, 0.6, 0.6)),
+        PointLight(Vec3f(4, 4, 10), RGBf(150, 150, 150)),
+        PointLight(Vec3f(-3, 10, 2.5), RGBf(60, 60, 60)),
+        PointLight(Vec3f(0, 3, 0.5), RGBf(40, 40, 40))
+    ])
+    cam3d!(scene)
+    cm = scene.camera_controls
+    mesh!(scene, model, material=glass)
+    mini, maxi = extrema(Rect3f(decompose(Point, model)))
+    floorrect = Rect3f(Vec3f(-10, mini[2], -10), Vec3f(20, -1, 20))
+    mesh!(scene, floorrect, material=plastic_ceil)
+    ceiling = Rect3f(Vec3f(-20, 12, -20), Vec3f(40, -1, 40))
+    mesh!(scene, ceiling, material=plastic)
+    center!(scene)
+    update_cam!(scene, Vec3f(-1.6, 6.2, 0.2), Vec3f(-3.6, 2.5, 2.4), Vec3f(0, 1, 0))
+
+    @time colorbuffer(scene; backend=RPRMakie, iterations=100)
+end

src/bounds.jl

@@ -33,22 +33,22 @@ end
 
 function Base.length(b::Bounds2)::Int64
     δ = ceil.(b.p_max .- b.p_min .+ 1f0)
-    Int64(δ[1] * δ[2])
+    u_int32(δ[1] * δ[2])
 end
 
 function Base.iterate(
-    b::Bounds2, i::Integer = 1,
-)::Union{Nothing,Tuple{Point2f,Integer}}
+        b::Bounds2, i::Integer = Int32(1),
+    )::Union{Nothing,Tuple{Point2f,Int32}}
     i > length(b) && return nothing
 
-    j = i - 1
+    j = i - Int32(1)
     δ = b.p_max .- b.p_min .+ 1f0
-    b.p_min .+ Point2f(j % δ[1], j ÷ δ[1]), i + 1
+    b.p_min .+ Point2f(j % δ[1], j ÷ δ[1]), i + Int32(1)
 end
 
 # Index through 8 corners.
 function corner(b::Bounds3, c::Integer)
-    c -= 1
+    c -= Int32(1)
     Point3f(
         b[(c&1)+1][1],
         b[(c & 2) != 0 ? 2 : 1][2],

src/film.jl

@@ -130,6 +130,7 @@ function FilmTile(f::Film, sample_bounds::Bounds2, radius)
 end
 
 function reset!(tile::FilmTile)
+
     tile.pixels.contrib_sum .= (RGBSpectrum(0f0),)
     tile.pixels.filter_weight_sum .= 0f0
 end
@@ -147,13 +148,13 @@ end
 
 function filter_offset!(offsets, start, stop, discrete_point, inv_filter_radius, filter_table_width)
     @inbounds for (i, x) in enumerate(Int(start):Int(stop))
-        fx = abs((x - discrete_point[1]) * inv_filter_radius * filter_table_width)
+        fx = abs((x - discrete_point) * inv_filter_radius * filter_table_width)
         offsets[i] = clamp(ceil(fx), 1, filter_table_width)  # TODO is clipping ok?
     end
 end
 
 @inline function filter_offset(x, discrete_point, inv_filter_radius, filter_table_width)
-    fx = abs((x - discrete_point[1]) * inv_filter_radius * filter_table_width)
+    fx = abs((x - discrete_point) * inv_filter_radius * filter_table_width)
     return clamp(u_int32(ceil(fx)), Int32(1), Int32(filter_table_width))  # TODO is clipping ok?
 end
 
@@ -187,8 +188,8 @@ function add_sample!(
     p0 = Int32.(max.(p0, max.(t.bounds.p_min, Point2{Int32}(1))))
     p1 = Int32.(min.(p1, t.bounds.p_max))
     # Precompute x & y filter offsets.
-    offsets_x = filter_offsets(p0[1], p1[1], discrete_point, t.inv_filter_radius[1], t.filter_table_width)
-    offsets_y = filter_offsets(p0[2], p1[2], discrete_point, t.inv_filter_radius[2], t.filter_table_width)
+    offsets_x = filter_offsets(p0[1], p1[1], discrete_point[1], t.inv_filter_radius[1], t.filter_table_width)
+    offsets_y = filter_offsets(p0[2], p1[2], discrete_point[2], t.inv_filter_radius[2], t.filter_table_width)
     # Loop over filter support & add sample to pixel array.
     pixels = t.pixels
     contrib_sum = pixels.contrib_sum
@@ -245,12 +246,18 @@ function set_image!(f::Film, spectrum::Matrix{S}) where {S<:Spectrum}
     f.pixels.splat_xyz .= (Point3f(0.0f0),)
 end
 
-function to_framebuffer!(film::Film, splat_scale::Float32 = 1f0)
-    image = film.framebuffer
-    xyz = film.pixels.xyz
-    filter_weight_sum = film.pixels.filter_weight_sum
-    splat_xyz = film.pixels.splat_xyz
-    @inbounds for idx in eachindex(film.pixels)
+function clear!(film::Film)
+    film.pixels.xyz .= (Point3f(0),)
+    film.pixels.filter_weight_sum .= 0.0f0
+    film.pixels.splat_xyz .= (Point3f(0),)
+end
+
+function to_framebuffer!(image, pixels, scale=1f0, splat_scale::Float32=1.0f0)
+    image .= RGB{Float32}(0.0f0, 0.0f0, 0.0f0)
+    xyz = pixels.xyz
+    filter_weight_sum = pixels.filter_weight_sum
+    splat_xyz = pixels.splat_xyz
+    @inbounds for idx in eachindex(pixels)
         rgb = XYZ_to_RGB(xyz[idx])
         # Normalize pixel with weight sum.
         fws = filter_weight_sum[idx]
@@ -261,16 +268,22 @@ function to_framebuffer!(film::Film, splat_scale::Float32 = 1f0)
         # Add splat value at pixel & scale.
         splat_rgb = XYZ_to_RGB(splat_xyz[idx])
         rgb = rgb .+ splat_scale .* splat_rgb
-        rgb = rgb .* film.scale
+        rgb = rgb .* scale
         rgb = map(rgb) do c
-            c = ifelse(isfinite(c), c, 0.0f0)
-            return clamp(c, 0.0f0, 1.0f0)
+            return ifelse(isfinite(c), c, 0.0f0)
         end
         image[idx] = RGB(rgb...)
     end
+    return image
+end
+
+function to_framebuffer!(film::Film, splat_scale::Float32 = 1f0)
+    image = film.framebuffer
+    to_framebuffer!(image, film.pixels, film.scale, splat_scale)
 end
 
 function save(film::Film, splat_scale::Float32 = 1f0)
     to_framebuffer!(film, splat_scale)
     FileIO.save(film.filename, @view film.framebuffer[end:-1:begin, :])
+    film.framebuffer
 end