source/blender/blenkernel/BKE_grease_pencil.hh

@@ -87,7 +87,7 @@ class Drawing : public ::GreasePencilDrawing {
   const bke::CurvesGeometry &strokes() const;
   bke::CurvesGeometry &strokes_for_write();
 
-  Array<IndexMask> get_shapes_index_masks(IndexMaskMemory &memory) const;
+  Vector<IndexMask> get_shapes_index_masks(IndexMaskMemory &memory) const;
 
   /**
    * The triangles for all the fills in the geometry.

source/blender/blenkernel/intern/grease_pencil.cc

@@ -367,32 +367,27 @@ Drawing::~Drawing()
   this->runtime = nullptr;
 }
 
-Array<IndexMask> Drawing::get_shapes_index_masks(IndexMaskMemory &memory) const
+Vector<IndexMask> Drawing::get_shapes_index_masks(IndexMaskMemory &memory) const
 {
   const CurvesGeometry &curves = this->strokes();
   const bke::AttributeAccessor attributes = curves.attributes();
 
-  const int num_curves = curves.curves_num();
-
   const VArray<int> shape_ids = *attributes.lookup<int>("shape_id", bke::AttrDomain::Curve);
 
   if (!shape_ids) {
     /* If the attribute does not exist then the default is each shape containing one curve. */
-    Array<IndexMask> data(num_curves);
-    IndexMask::from_groups<int>(
-        IndexMask(num_curves), memory, [&](const int i) { return i; }, data);
+    Vector<IndexMask> shapes;
+    for (const int i : curves.curves_range()) {
+      shapes.append(IndexRange::from_single(i));
+    }
 
-    return data;
+    return shapes;
   }
 
-  const int max_shape_id = *std::max_element(shape_ids.get_internal_span().begin(),
-                                             shape_ids.get_internal_span().end());
+  VectorSet<int> shape_indexing;
+  const Vector<IndexMask> shapes = IndexMask::from_group_ids(shape_ids, memory, shape_indexing);
 
-  Array<IndexMask> data(max_shape_id + 1);
-  IndexMask::from_groups<int>(
-      IndexRange(num_curves), memory, [&](const int i) { return shape_ids[i]; }, data);
-
-  return data;
+  return shapes;
 }
 
 static bool check_self_intersections(Span<float2> projverts)
@@ -530,7 +525,7 @@ Span<Vector<uint3>> Drawing::triangles() const
     const Array<int> point_to_curve_map = curves.point_to_curve_map();
 
     IndexMaskMemory memory;
-    const Array<IndexMask> groups = this->get_shapes_index_masks(memory);
+    const Vector<IndexMask> groups = this->get_shapes_index_masks(memory);
 
     r_data.resize(groups.size() + 1);
     MutableSpan<Vector<uint3>> strokes_triangles = r_data.as_mutable_span();

source/blender/draw/engines/gpencil/gpencil_engine_c.cc

@@ -725,7 +725,7 @@ static GPENCIL_tObject *grease_pencil_object_cache_populate(GPENCIL_PrivateData
     IndexMaskMemory memory;
     const IndexMask visible_strokes = ed::greasepencil::retrieve_visible_strokes(
         *ob, info.drawing, memory);
-    const Array<IndexMask> groups = info.drawing.get_shapes_index_masks(memory);
+    const Vector<IndexMask> groups = info.drawing.get_shapes_index_masks(memory);
 
     /* Precompute all the triangle and vertex counts.
      * In case the drawing should not be rendered, we need to compute the offset where the next

source/blender/draw/engines/overlay/overlay_next_grease_pencil.hh

@@ -89,7 +89,7 @@ class GreasePencil {
       IndexMaskMemory memory;
       const IndexMask visible_strokes = ed::greasepencil::retrieve_visible_strokes(
           *ob, info.drawing, memory);
-      const Array<IndexMask> groups = info.drawing.get_shapes_index_masks(memory);
+      const Vector<IndexMask> groups = info.drawing.get_shapes_index_masks(memory);
 
       const Span<Vector<uint3>> triangles = info.drawing.triangles();
 

source/blender/draw/engines/overlay/overlay_outline.cc

@@ -323,7 +323,7 @@ static void OVERLAY_outline_grease_pencil(OVERLAY_PrivateData *pd, Scene *scene,
     IndexMaskMemory memory;
     const IndexMask visible_strokes = ed::greasepencil::retrieve_visible_strokes(
         *ob, info.drawing, memory);
-    const Array<IndexMask> groups = info.drawing.get_shapes_index_masks(memory);
+    const Vector<IndexMask> groups = info.drawing.get_shapes_index_masks(memory);
 
     const Span<Vector<uint3>> triangles = info.drawing.triangles();
 

source/blender/draw/intern/draw_cache_impl_grease_pencil.cc

@@ -1194,7 +1194,7 @@ static void grease_pencil_geom_batch_ensure(Object &object,
       GPU_indexbuf_add_tri_verts(&ibo, v_mat + 2, v_mat + 1, v_mat + 3);
     };
 
-    const Array<IndexMask> groups = info.drawing.get_shapes_index_masks(memory);
+    const Vector<IndexMask> groups = info.drawing.get_shapes_index_masks(memory);
     const Array<int> point_to_curve_map = curves.point_to_curve_map();
 
     auto point_to_id = [&](uint32_t p) {