summaryrefslogtreecommitdiff
path: root/src/modules/meta2d
diff options
context:
space:
mode:
authorVito Caputo <vcaputo@pengaru.com>2022-05-01 11:43:42 -0700
committerVito Caputo <vcaputo@pengaru.com>2022-05-01 13:50:26 -0700
commita81425632db81527bcecd2d0fbdb5b09c25141ba (patch)
treebdc6ba54c39e9a859d2c87e9a0a87d70b85e00a8 /src/modules/meta2d
parent45d1f956b35fa9003106716e42425cc86cadc7a1 (diff)
modules/*: make use of generic fragmenters
Just one case, modules/submit, was using 32x32 tiles and is now using 64x64. I don't expect it to make any difference. While here I fixed up the num_cpus/n_cpus naming inconsistencies, normalizing on n_cpus.
Diffstat (limited to 'src/modules/meta2d')
-rw-r--r--src/modules/meta2d/meta2d.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/src/modules/meta2d/meta2d.c b/src/modules/meta2d/meta2d.c
index 327a4d9..01bbc58 100644
--- a/src/modules/meta2d/meta2d.c
+++ b/src/modules/meta2d/meta2d.c
@@ -39,7 +39,6 @@ typedef struct meta2d_context_t {
unsigned n;
din_t *din_a, *din_b;
float din_t;
- unsigned n_cpus;
meta2d_ball_t balls[META2D_NUM_BALLS];
} meta2d_context_t;
@@ -66,7 +65,7 @@ static inline uint32_t color_to_uint32(v3f_t color) {
}
-static void * meta2d_create_context(unsigned ticks, unsigned num_cpus, til_setup_t *setup)
+static void * meta2d_create_context(unsigned ticks, unsigned n_cpus, til_setup_t *setup)
{
meta2d_context_t *ctxt;
@@ -76,8 +75,6 @@ static void * meta2d_create_context(unsigned ticks, unsigned num_cpus, til_setup
ctxt->din_a = din_new(10, 10, META2D_NUM_BALLS + 2);
ctxt->din_b = din_new(10, 10, META2D_NUM_BALLS + 2);
- ctxt->n_cpus = num_cpus;
-
for (int i = 0; i < META2D_NUM_BALLS; i++) {
meta2d_ball_t *ball = &ctxt->balls[i];
@@ -100,19 +97,11 @@ static void meta2d_destroy_context(void *context)
}
-static int meta2d_fragmenter(void *context, unsigned n_cpus, const til_fb_fragment_t *fragment, unsigned number, til_fb_fragment_t *res_fragment)
-{
- meta2d_context_t *ctxt = context;
-
- return til_fb_fragment_slice_single(fragment, ctxt->n_cpus, number, res_fragment);
-}
-
-
static void meta2d_prepare_frame(void *context, unsigned ticks, unsigned n_cpus, til_fb_fragment_t *fragment, til_fragmenter_t *res_fragmenter)
{
meta2d_context_t *ctxt = context;
- *res_fragmenter = meta2d_fragmenter;
+ *res_fragmenter = til_fragmenter_slice_per_cpu;
/* move the balls around */
for (int i = 0; i < META2D_NUM_BALLS; i++) {
© All Rights Reserved