expand scope vmap sorting -> all vmaps; do final vmap bakes; do first pass of scope (1 scope -> many locals, many voffs) layout / baking

src/base/base_math.c

@@ -809,3 +809,20 @@ rng1s64_array_from_list(Arena *arena, Rng1S64List *list)
   }
   return arr;
 }
+
+////////////////////////////////
+//~ rjf: N -> M Element Subdivision
+
+internal Rng1U64
+m_range_from_n_idx_m_count(U64 n_idx, U64 n_count, U64 m_count)
+{
+  U64 main_idxes_per_lane = m_count/n_count;
+  U64 leftover_idxes_count = m_count - main_idxes_per_lane*n_count;
+  U64 leftover_idxes_before_this_lane_count = Min(n_idx, leftover_idxes_count);
+  U64 lane_base_idx = n_idx*main_idxes_per_lane + leftover_idxes_before_this_lane_count;
+  U64 lane_base_idx__clamped = Min(lane_base_idx, m_count);
+  U64 lane_opl_idx = lane_base_idx__clamped + main_idxes_per_lane + ((n_idx < leftover_idxes_count) ? 1 : 0);
+  U64 lane_opl_idx__clamped = Min(lane_opl_idx, m_count);
+  Rng1U64 result = r1u64(lane_base_idx__clamped, lane_opl_idx__clamped);
+  return result;
+}

src/base/base_math.h

@@ -691,4 +691,9 @@ internal U64 rng_1u64_array_bsearch(Rng1U64Array arr, U64 value);
 internal void rng1s64_list_push(Arena *arena, Rng1S64List *list, Rng1S64 rng);
 internal Rng1S64Array rng1s64_array_from_list(Arena *arena, Rng1S64List *list);
 
+////////////////////////////////
+//~ rjf: N -> M Element Subdivision
+
+internal Rng1U64 m_range_from_n_idx_m_count(U64 n_idx, U64 n_count, U64 m_count);
+
 #endif //BASE_MATH_H

src/base/base_thread_context.c

@@ -94,20 +94,6 @@ tctx_lane_barrier_wait(void)
   ProfEnd();
 }
 
-internal Rng1U64
-tctx_lane_idx_range_from_count(U64 count)
-{
-  U64 main_idxes_per_lane = count/lane_count();
-  U64 leftover_idxes_count = count - main_idxes_per_lane*lane_count();
-  U64 leftover_idxes_before_this_lane_count = Min(lane_idx(), leftover_idxes_count);
-  U64 lane_base_idx = lane_idx()*main_idxes_per_lane + leftover_idxes_before_this_lane_count;
-  U64 lane_base_idx__clamped = Min(lane_base_idx, count);
-  U64 lane_opl_idx = lane_base_idx__clamped + main_idxes_per_lane + ((lane_idx() < leftover_idxes_count) ? 1 : 0);
-  U64 lane_opl_idx__clamped = Min(lane_opl_idx, count);
-  Rng1U64 result = r1u64(lane_base_idx__clamped, lane_opl_idx__clamped);
-  return result;
-}
-
 //- rjf: thread names
 
 internal void

src/base/base_thread_context.h

@@ -53,13 +53,12 @@ internal Arena *tctx_get_scratch(Arena **conflicts, U64 count);
 //- rjf: lane metadata
 internal LaneCtx tctx_set_lane_ctx(LaneCtx lane_ctx);
 internal void tctx_lane_barrier_wait(void);
-internal Rng1U64 tctx_lane_idx_range_from_count(U64 count);
 #define lane_idx() (tctx_selected()->lane_ctx.lane_idx)
 #define lane_count() (tctx_selected()->lane_ctx.lane_count)
 #define lane_from_task_idx(idx) ((idx)%lane_count())
 #define lane_ctx(ctx) tctx_set_lane_ctx((ctx))
 #define lane_sync() tctx_lane_barrier_wait()
-#define lane_range(count) tctx_lane_idx_range_from_count(count)
+#define lane_range(count) m_range_from_n_idx_m_count(lane_idx(), lane_count(), (count))
 
 //- rjf: thread names
 internal void tctx_set_thread_name(String8 name);