remove indices from compact triangle and run test_wavefront with same parameters as gpu benchmark

Author: SimonDanisch

docs/src/test_wavefront.jl

@@ -16,17 +16,17 @@ include("wavefront-renderer.jl")
 
 geom, ctx = example_scene()
 bvh = BVH(geom)
-ibvh = Raycore.InstancedBVH(geom)
+# ibvh = Raycore.InstancedBVH(geom)
 begin
-    img = fill(RGBf(0, 0, 0), 1024, 2048)
+    img = fill(RGBf(0, 0, 0), 400, 720)
     renderer = WavefrontRenderer(img, bvh, ctx)
     @btime render!(renderer)
     nothing
 end
 renderer.framebuffer
 renderer_instanced.framebuffer
 begin
-    img = fill(RGBf(0, 0, 0), 1024, 2048)
+    img = fill(RGBf(0, 0, 0), 400, 720)
     renderer_instanced = WavefrontRenderer(
         img, ibvh, ctx;
         camera_pos=Point3f(0, -0.9, -2.5),
@@ -43,7 +43,7 @@ using FileIO
 save("wavefront.png", map(col -> mapc(c -> clamp(c, 0f0, 1f0), col), renderer.framebuffer))
 
 using AMDGPU
-amd_renderer = to_gpu(ROCArray, renderer_instanced);
+amd_renderer = to_gpu(ROCArray, renderer);
 Array(@btime render!(amd_renderer))
 
 using pocl_jll, OpenCL

src/bvh.jl

@@ -84,14 +84,12 @@ Fields:
 - edge1: v1 - v0 edge vector
 - edge2: v2 - v0 edge vector
 - normal: Face normal (4th component for alignment)
-- indices: [material_idx, primitive_idx] for shading
 """
 struct CompactTriangle
     v0::SVector{4, Float32}
     edge1::SVector{4, Float32}
     edge2::SVector{4, Float32}
     normal::SVector{4, Float32}
-    indices::SVector{2, UInt32}
 end
 
 """
@@ -113,7 +111,6 @@ Convert a Triangle to CompactTriangle format with pre-computed edge vectors.
         SVector{4, Float32}(edge1[1], edge1[2], edge1[3], 0f0),
         SVector{4, Float32}(edge2[1], edge2[2], edge2[3], 0f0),
         SVector{4, Float32}(face_normal[1], face_normal[2], face_normal[3], 0f0),
-        SVector{2, UInt32}(tri.material_idx, tri.primitive_idx)
     )
 end
 
@@ -292,9 +289,8 @@ function _init(
     )
     dim = maximum_extent(centroid_bounds)
     ( # Create leaf node.
-        !is_valid(centroid_bounds)
-        ||
-        centroid_bounds.p_min[dim] == centroid_bounds.p_max[dim]
+        !is_valid(centroid_bounds) ||
+            centroid_bounds.p_min[dim] == centroid_bounds.p_max[dim]
     ) && return _create_leaf()
     # Partition primitives into sets and build children.
     if n_primitives <= 2 # Equally-sized subsets.