summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorVito Caputo <vcaputo@pengaru.com>2019-11-24 11:39:40 -0800
committerVito Caputo <vcaputo@pengaru.com>2019-11-24 11:39:40 -0800
commit13189997111deac782df2be3db4e4669d5635ca2 (patch)
treee1dfc0e1c3031b9aaff1c0d0c09933f9311cce16 /src
parent8f774980b9222f39f9e74e8e3a694cad55753e2f (diff)
rototiller: rototiller_fragmenter_t s/num/number/
Mechanical change removing abbreviation for consistency
Diffstat (limited to 'src')
-rw-r--r--src/fb.c14
-rw-r--r--src/modules/flui2d/flui2d.c4
-rw-r--r--src/modules/julia/julia.c4
-rw-r--r--src/modules/plasma/plasma.c4
-rw-r--r--src/modules/ray/ray.c4
-rw-r--r--src/modules/roto/roto.c4
-rw-r--r--src/modules/snow/snow.c4
-rw-r--r--src/modules/sparkler/sparkler.c4
-rw-r--r--src/modules/submit/submit.c4
-rw-r--r--src/modules/swab/swab.c4
-rw-r--r--src/rototiller.h2
11 files changed, 26 insertions, 26 deletions
diff --git a/src/fb.c b/src/fb.c
index c37cc04..c909f6a 100644
--- a/src/fb.c
+++ b/src/fb.c
@@ -310,10 +310,10 @@ fail:
/* helpers for fragmenting incrementally */
-int fb_fragment_slice_single(const fb_fragment_t *fragment, unsigned n_fragments, unsigned num, fb_fragment_t *res_fragment)
+int fb_fragment_slice_single(const fb_fragment_t *fragment, unsigned n_fragments, unsigned number, fb_fragment_t *res_fragment)
{
unsigned slice = fragment->height / n_fragments;
- unsigned yoff = slice * num;
+ unsigned yoff = slice * number;
unsigned pitch;
if (yoff >= fragment->height)
@@ -328,13 +328,13 @@ int fb_fragment_slice_single(const fb_fragment_t *fragment, unsigned n_fragments
res_fragment->frame_height = fragment->frame_height;
res_fragment->stride = fragment->stride;
res_fragment->pitch = fragment->pitch;
- res_fragment->number = num;
+ res_fragment->number = number;
return 1;
}
-int fb_fragment_tile_single(const fb_fragment_t *fragment, unsigned tile_size, unsigned num, fb_fragment_t *res_fragment)
+int fb_fragment_tile_single(const fb_fragment_t *fragment, unsigned tile_size, unsigned number, fb_fragment_t *res_fragment)
{
unsigned w = fragment->width / tile_size, h = fragment->height / tile_size;
unsigned x, y, xoff, yoff;
@@ -345,11 +345,11 @@ int fb_fragment_tile_single(const fb_fragment_t *fragment, unsigned tile_size, u
if (h * tile_size < fragment->height)
h++;
- y = num / w;
+ y = number / w;
if (y >= h)
return 0;
- x = num - (y * w);
+ x = number - (y * w);
xoff = x * tile_size;
yoff = y * tile_size;
@@ -363,7 +363,7 @@ int fb_fragment_tile_single(const fb_fragment_t *fragment, unsigned tile_size, u
res_fragment->frame_height = fragment->frame_height;
res_fragment->stride = fragment->stride + ((fragment->width - res_fragment->width) * 4);
res_fragment->pitch = fragment->pitch;
- res_fragment->number = num;
+ res_fragment->number = number;
return 1;
}
diff --git a/src/modules/flui2d/flui2d.c b/src/modules/flui2d/flui2d.c
index 1464c7d..b7aa1b1 100644
--- a/src/modules/flui2d/flui2d.c
+++ b/src/modules/flui2d/flui2d.c
@@ -208,9 +208,9 @@ static void flui2d_destroy_context(void *context)
}
-static int flui2d_fragmenter(void *context, const fb_fragment_t *fragment, unsigned num, fb_fragment_t *res_fragment)
+static int flui2d_fragmenter(void *context, const fb_fragment_t *fragment, unsigned number, fb_fragment_t *res_fragment)
{
- return fb_fragment_tile_single(fragment, 64, num, res_fragment);
+ return fb_fragment_tile_single(fragment, 64, number, res_fragment);
}
diff --git a/src/modules/julia/julia.c b/src/modules/julia/julia.c
index ff44a70..22a79fd 100644
--- a/src/modules/julia/julia.c
+++ b/src/modules/julia/julia.c
@@ -102,11 +102,11 @@ static inline unsigned julia_iter(float real, float imag, float creal, float cim
}
-static int julia_fragmenter(void *context, const fb_fragment_t *fragment, unsigned num, fb_fragment_t *res_fragment)
+static int julia_fragmenter(void *context, const fb_fragment_t *fragment, unsigned number, fb_fragment_t *res_fragment)
{
julia_context_t *ctxt = context;
- return fb_fragment_slice_single(fragment, ctxt->n_cpus, num, res_fragment);
+ return fb_fragment_slice_single(fragment, ctxt->n_cpus, number, res_fragment);
}
diff --git a/src/modules/plasma/plasma.c b/src/modules/plasma/plasma.c
index cf32a41..ba34054 100644
--- a/src/modules/plasma/plasma.c
+++ b/src/modules/plasma/plasma.c
@@ -59,11 +59,11 @@ static void plasma_destroy_context(void *context)
}
-static int plasma_fragmenter(void *context, const fb_fragment_t *fragment, unsigned num, fb_fragment_t *res_fragment)
+static int plasma_fragmenter(void *context, const fb_fragment_t *fragment, unsigned number, fb_fragment_t *res_fragment)
{
plasma_context_t *ctxt = context;
- return fb_fragment_slice_single(fragment, ctxt->n_cpus, num, res_fragment);
+ return fb_fragment_slice_single(fragment, ctxt->n_cpus, number, res_fragment);
}
diff --git a/src/modules/ray/ray.c b/src/modules/ray/ray.c
index ad710bc..dd33b19 100644
--- a/src/modules/ray/ray.c
+++ b/src/modules/ray/ray.c
@@ -136,9 +136,9 @@ static void ray_destroy_context(void *context)
}
-static int ray_fragmenter(void *context, const fb_fragment_t *fragment, unsigned num, fb_fragment_t *res_fragment)
+static int ray_fragmenter(void *context, const fb_fragment_t *fragment, unsigned number, fb_fragment_t *res_fragment)
{
- return fb_fragment_tile_single(fragment, 64, num, res_fragment);
+ return fb_fragment_tile_single(fragment, 64, number, res_fragment);
}
diff --git a/src/modules/roto/roto.c b/src/modules/roto/roto.c
index 8e91c89..56ca08a 100644
--- a/src/modules/roto/roto.c
+++ b/src/modules/roto/roto.c
@@ -169,11 +169,11 @@ static void init_roto(uint8_t texture[256][256], int32_t *costab, int32_t *sinta
}
-static int roto_fragmenter(void *context, const fb_fragment_t *fragment, unsigned num, fb_fragment_t *res_fragment)
+static int roto_fragmenter(void *context, const fb_fragment_t *fragment, unsigned number, fb_fragment_t *res_fragment)
{
roto_context_t *ctxt = context;
- return fb_fragment_slice_single(fragment, ctxt->n_cpus, num, res_fragment);
+ return fb_fragment_slice_single(fragment, ctxt->n_cpus, number, res_fragment);
}
diff --git a/src/modules/snow/snow.c b/src/modules/snow/snow.c
index cf3ffa7..8968e47 100644
--- a/src/modules/snow/snow.c
+++ b/src/modules/snow/snow.c
@@ -17,9 +17,9 @@
*/
static int snow_seed;
-static int snow_fragmenter(void *context, const fb_fragment_t *fragment, unsigned num, fb_fragment_t *res_fragment)
+static int snow_fragmenter(void *context, const fb_fragment_t *fragment, unsigned number, fb_fragment_t *res_fragment)
{
- return fb_fragment_slice_single(fragment, 32, num, res_fragment);
+ return fb_fragment_slice_single(fragment, 32, number, res_fragment);
}
diff --git a/src/modules/sparkler/sparkler.c b/src/modules/sparkler/sparkler.c
index 12138c9..b2de5ee 100644
--- a/src/modules/sparkler/sparkler.c
+++ b/src/modules/sparkler/sparkler.c
@@ -59,11 +59,11 @@ static void sparkler_destroy_context(void *context)
}
-static int sparkler_fragmenter(void *context, const fb_fragment_t *fragment, unsigned num, fb_fragment_t *res_fragment)
+static int sparkler_fragmenter(void *context, const fb_fragment_t *fragment, unsigned number, fb_fragment_t *res_fragment)
{
sparkler_context_t *ctxt = context;
- return fb_fragment_slice_single(fragment, ctxt->n_cpus, num, res_fragment);
+ return fb_fragment_slice_single(fragment, ctxt->n_cpus, number, res_fragment);
}
static void sparkler_prepare_frame(void *context, unsigned ncpus, fb_fragment_t *fragment, rototiller_fragmenter_t *res_fragmenter)
diff --git a/src/modules/submit/submit.c b/src/modules/submit/submit.c
index 254cc78..7035a3a 100644
--- a/src/modules/submit/submit.c
+++ b/src/modules/submit/submit.c
@@ -284,9 +284,9 @@ static void submit_destroy_context(void *context)
}
-static int submit_fragmenter(void *context, const fb_fragment_t *fragment, unsigned num, fb_fragment_t *res_fragment)
+static int submit_fragmenter(void *context, const fb_fragment_t *fragment, unsigned number, fb_fragment_t *res_fragment)
{
- return fb_fragment_tile_single(fragment, 32, num, res_fragment);
+ return fb_fragment_tile_single(fragment, 32, number, res_fragment);
}
diff --git a/src/modules/swab/swab.c b/src/modules/swab/swab.c
index 9c26da2..e4c3670 100644
--- a/src/modules/swab/swab.c
+++ b/src/modules/swab/swab.c
@@ -87,11 +87,11 @@ static void swab_destroy_context(void *context)
}
-static int swab_fragmenter(void *context, const fb_fragment_t *fragment, unsigned num, fb_fragment_t *res_fragment)
+static int swab_fragmenter(void *context, const fb_fragment_t *fragment, unsigned number, fb_fragment_t *res_fragment)
{
swab_context_t *ctxt = context;
- return fb_fragment_slice_single(fragment, ctxt->n_cpus, num, res_fragment);
+ return fb_fragment_slice_single(fragment, ctxt->n_cpus, number, res_fragment);
}
diff --git a/src/rototiller.h b/src/rototiller.h
index a81c3e4..70b9ef2 100644
--- a/src/rototiller.h
+++ b/src/rototiller.h
@@ -5,7 +5,7 @@
/* rototiller_fragmenter produces fragments from an input fragment, num being the desired fragment for the current call.
* return value of 1 means a fragment has been produced, 0 means num is beyond the end of fragments. */
-typedef int (*rototiller_fragmenter_t)(void *context, const fb_fragment_t *fragment, unsigned num, fb_fragment_t *res_fragment);
+typedef int (*rototiller_fragmenter_t)(void *context, const fb_fragment_t *fragment, unsigned number, fb_fragment_t *res_fragment);
typedef struct settings_t settings;
typedef struct setting_desc_t setting_desc_t;
© All Rights Reserved