Commit: 8214c03d64c9c5348385142591d03670257e0f39
Parent: 86e9754e4f523538cbd5c16847fddf915997bd34
Author: Randy Palamar
Date: Wed, 26 Feb 2025 11:41:31 -0700
core: fix completion goal; ui: beamforming progress bar
Diffstat:
| M | beamformer.c | | | 30 | +++++++++++++++++++++++------- |
| M | beamformer.h | | | 4 | ++++ |
| M | ui.c | | | 83 | ++++++++++++++++++++++++------------------------------------------------------- |
3 files changed, 52 insertions(+), 65 deletions(-)
diff --git a/beamformer.c b/beamformer.c
@@ -294,6 +294,9 @@ struct compute_cursor {
iv3 cursor;
iv3 dispatch;
iv3 target;
+ u32 points_per_dispatch;
+ u32 completed_points;
+ u32 total_points;
};
static struct compute_cursor
@@ -313,17 +316,19 @@ start_compute_cursor(uv3 dim, u32 max_points)
result.target.y = MAX(dim.y / result.dispatch.y / DAS_LOCAL_SIZE_Y, 1);
result.target.z = MAX(dim.z / result.dispatch.z / DAS_LOCAL_SIZE_Z, 1);
+ result.points_per_dispatch = 1;
+ result.points_per_dispatch *= result.dispatch.x * DAS_LOCAL_SIZE_X;
+ result.points_per_dispatch *= result.dispatch.y * DAS_LOCAL_SIZE_Y;
+ result.points_per_dispatch *= result.dispatch.z * DAS_LOCAL_SIZE_Z;
+
+ result.total_points = dim.x * dim.y * dim.z;
+
return result;
}
static iv3
step_compute_cursor(struct compute_cursor *cursor)
{
- iv3 result = cursor->cursor;
- result.x *= cursor->dispatch.x * DAS_LOCAL_SIZE_X;
- result.y *= cursor->dispatch.y * DAS_LOCAL_SIZE_Y;
- result.z *= cursor->dispatch.z * DAS_LOCAL_SIZE_Z;
-
cursor->cursor.x += 1;
if (cursor->cursor.x >= cursor->target.x) {
cursor->cursor.x = 0;
@@ -334,13 +339,20 @@ step_compute_cursor(struct compute_cursor *cursor)
}
}
+ cursor->completed_points += cursor->points_per_dispatch;
+
+ iv3 result = cursor->cursor;
+ result.x *= cursor->dispatch.x * DAS_LOCAL_SIZE_X;
+ result.y *= cursor->dispatch.y * DAS_LOCAL_SIZE_Y;
+ result.z *= cursor->dispatch.z * DAS_LOCAL_SIZE_Z;
+
return result;
}
static b32
compute_cursor_finished(struct compute_cursor *cursor)
{
- b32 result = cursor->cursor.z > cursor->target.z;
+ b32 result = cursor->completed_points >= cursor->total_points;
return result;
}
@@ -410,10 +422,13 @@ do_compute_shader(BeamformerCtx *ctx, Arena arena, BeamformFrame *frame, u32 raw
* transmit_count * channel_count product */
u32 max_points_per_dispatch = KB(64);
struct compute_cursor cursor = start_compute_cursor(frame->dim, max_points_per_dispatch);
- for (iv3 offset = step_compute_cursor(&cursor);
+ f32 percent_per_step = (f32)cursor.points_per_dispatch / (f32)cursor.total_points;
+ csctx->processing_progress = -percent_per_step;
+ for (iv3 offset = {0};
!compute_cursor_finished(&cursor);
offset = step_compute_cursor(&cursor))
{
+ csctx->processing_progress += percent_per_step;
/* IMPORTANT(rnp): prevents OS from coalescing and killing our shader */
glFinish();
glUniform3iv(csctx->voxel_offset_id, 1, offset.E);
@@ -650,6 +665,7 @@ DEBUG_EXPORT BEAMFORMER_COMPLETE_COMPUTE_FN(beamformer_complete_compute)
}
/* NOTE(rnp): block until work completes so that we can record timings */
glFinish();
+ cs->processing_progress = 1;
for (u32 i = 0; i < ARRAY_COUNT(frame->timer_ids); i++) {
u64 ns = 0;
diff --git a/beamformer.h b/beamformer.h
@@ -170,6 +170,9 @@ typedef struct {
v2 ruler_stop_p;
u32 ruler_state;
+ f32 progress_display_t;
+ f32 progress_display_t_velocity;
+
BeamformerUIParameters params;
b32 flush_params;
/* TODO(rnp): this is nasty and should be removed */
@@ -206,6 +209,7 @@ typedef struct {
u32 shared_ubo;
+ f32 processing_progress;
b32 processing_compute;
uv4 dec_data_dim;
diff --git a/ui.c b/ui.c
@@ -7,9 +7,9 @@ colour_from_normalized(v4 rgba)
}
static Color
-fade(Color a, f32 alpha)
+fade(Color a, f32 visibility)
{
- a.a = (u8)((f32)a.a * alpha);
+ a.a = (u8)((f32)a.a * visibility);
return a;
}
@@ -650,35 +650,6 @@ draw_settings_ui(BeamformerCtx *ctx, Rect r, v2 mouse)
draw_r.pos.y += 2 * LISTING_LINE_PAD;
draw_r.size.y -= 2 * LISTING_LINE_PAD;
- #if 0
- /* TODO: work this into the work queue */
- bmv = (BPModifiableValue){&ctx->partial_compute_ctx.volume_dim.x, bmv_store_power_of_two,
- .ilimits = (iv2){.x = 1, .y = ctx->gl.max_3d_texture_dim},
- MV_INT, 1, 1};
- draw_r = do_text_input_listing(s8("Export Dimension X:"), s8(""), bmv, ctx, arena,
- draw_r, mouse, hover_t + idx++);
-
- bmv = (BPModifiableValue){&ctx->partial_compute_ctx.volume_dim.y, bmv_store_power_of_two,
- .ilimits = (iv2){.x = 1, .y = ctx->gl.max_3d_texture_dim},
- MV_INT, 1, 1};
- draw_r = do_text_input_listing(s8("Export Dimension Y:"), s8(""), bmv, ctx, arena,
- draw_r, mouse, hover_t + idx++);
-
- bmv = (BPModifiableValue){&ctx->partial_compute_ctx.volume_dim.z, bmv_store_power_of_two,
- .ilimits = (iv2){.x = 1, .y = ctx->gl.max_3d_texture_dim},
- MV_INT, 1, 1};
- draw_r = do_text_input_listing(s8("Export Dimension Z:"), s8(""), bmv, ctx, arena,
- draw_r, mouse, hover_t + idx++);
-
- Rect btn_r = draw_r;
- btn_r.size.h = ctx->font.baseSize * 1.3;
- btn_r.size.w *= 0.6;
- if (do_text_button(ctx, s8("Dump Raw Volume"), btn_r, mouse, hover_t + idx++)) {
- if (!ctx->partial_compute_ctx.state) {
- }
- }
- #endif
-
/* NOTE: if C compilers didn't suck this would be a static assert */
ASSERT(idx <= ARRAY_COUNT(hover_t));
}
@@ -724,33 +695,29 @@ draw_debug_overlay(BeamformerCtx *ctx, BeamformFrame *frame, Arena arena, Rect r
v2 rpos = {.x = r.pos.x + r.size.w - txt_fs.w, .y = pos.y};
draw_text(ui->font, stream_to_s8(&buf), rpos, 0, colour_from_normalized(FG_COLOUR));
- {
- static v2 pos = {.x = 32, .y = 128};
- static v2 scale = {.x = 1.0, .y = 1.0};
- static u32 txt_idx = 0;
- static s8 txt[2] = { s8("-_-"), s8("^_^") };
- static v2 ts[2];
- if (ts[0].x == 0) {
- ts[0] = measure_text(ui->font, txt[0]);
- ts[1] = measure_text(ui->font, txt[1]);
- }
-
- pos.x += 130 * dt_for_frame * scale.x;
- pos.y += 120 * dt_for_frame * scale.y;
-
- if (pos.x > (ws.w - ts[txt_idx].x) || pos.x < 0) {
- txt_idx = !txt_idx;
- pos.x = CLAMP(pos.x, 0, ws.w - ts[txt_idx].x);
- scale.x *= -1.0;
- }
-
- if (pos.y > (ws.h - ts[txt_idx].y) || pos.y < 0) {
- txt_idx = !txt_idx;
- pos.y = CLAMP(pos.y, 0, ws.h - ts[txt_idx].y);
- scale.y *= -1.0;
- }
-
- draw_text(ui->font, txt[txt_idx], pos, 0, RED);
+ pos.y -= ui->font_height;
+ if (ctx->csctx.processing_compute) ui->progress_display_t_velocity += 65 * dt_for_frame;
+ else ui->progress_display_t_velocity -= 45 * dt_for_frame;
+
+ ui->progress_display_t_velocity = CLAMP(ui->progress_display_t_velocity, -10, 10);
+ ui->progress_display_t += ui->progress_display_t_velocity * dt_for_frame;
+ ui->progress_display_t = CLAMP01(ui->progress_display_t);
+
+ if (ui->progress_display_t > (1.0 / 255.0)) {
+ s8 progress_text = s8("Compute Progress:");
+ v2 txt_s = measure_text(ui->font, progress_text);
+ rpos = (v2){.x = pos.x + txt_s.x + 8, .y = pos.y};
+ draw_text(ui->font, progress_text, pos, 0,
+ fade(colour_from_normalized(FG_COLOUR), ui->progress_display_t));
+ Rect prect = {.pos = rpos, .size = {.w = r.size.w - rpos.x, .h = txt_s.h}};
+ prect = scale_rect_centered(prect, (v2){.x = 1, .y = 0.7});
+ Rect fprect = prect;
+ fprect.size.w *= ctx->csctx.processing_progress;
+ DrawRectangleRounded(fprect.rl, 2, 0, fade(colour_from_normalized(HOVERED_COLOUR),
+ ui->progress_display_t));
+ DrawRectangleRoundedLinesEx(prect.rl, 2, 0, 4.0, colour_from_normalized(BG_COLOUR));
+ prect = scale_rect_centered(prect, (v2){.x = 0.99, .y = 1});
+ DrawRectangleRoundedLinesEx(prect.rl, 2, 0, 2.5, fade(BLACK, ui->progress_display_t));
}
}