summaryrefslogtreecommitdiff
path: root/src/modules/montage
diff options
context:
space:
mode:
authorVito Caputo <vcaputo@pengaru.com>2022-04-24 19:24:47 -0700
committerVito Caputo <vcaputo@pengaru.com>2022-04-24 19:24:47 -0700
commit9f9f9eaa096e6be8c1613014868e919d6991b188 (patch)
treeba943101653dd2729cad4ae19c9e6f5f583f5977 /src/modules/montage
parent1435249cd1cac95d31403a9592018eaad9c7cb00 (diff)
*: s/void */til_setup_t */
This brings something resembling an actual type to the private objects returrned in *res_setup. Internally libtil/rototiller wants this to be a til_setup_t, and it's up to the private users of what's returned in *res_setup to embed this appropriately and either use container_of() or casting when simply embedded at the start to go between til_setup_t and their private containing struct. Everywhere *res_setup was previously allocated using calloc() is now using til_setup_new() with a free_func, which til_setup_new() will initialize appropriately. There's still some remaining work to do with the supplied free_func in some modules, where free() isn't quite appropriate. Setup freeing isn't actually being performed yet, but this sets the foundation for that to happen in a subsequent commit that cleans up the setup leaks. Many modules use a static default setup for when no setup has been provided. In those cases, the free_func would be NULL, which til_setup_new() refuses to do. When setup freeing actually starts happening, it'll simply skip freeing when til_setup_t.free_func is NULL.
Diffstat (limited to 'src/modules/montage')
-rw-r--r--src/modules/montage/montage.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/modules/montage/montage.c b/src/modules/montage/montage.c
index 15c1354..268d7db 100644
--- a/src/modules/montage/montage.c
+++ b/src/modules/montage/montage.c
@@ -16,7 +16,7 @@ typedef struct montage_context_t {
} montage_context_t;
static void setup_next_module(montage_context_t *ctxt);
-static void * montage_create_context(unsigned ticks, unsigned num_cpus, void *setup);
+static void * montage_create_context(unsigned ticks, unsigned num_cpus, til_setup_t *setup);
static void montage_destroy_context(void *context);
static void montage_prepare_frame(void *context, unsigned ticks, unsigned n_cpus, til_fb_fragment_t *fragment, til_fragmenter_t *res_fragmenter);
static void montage_render_fragment(void *context, unsigned ticks, unsigned cpu, til_fb_fragment_t *fragment);
@@ -32,7 +32,7 @@ til_module_t montage_module = {
};
-static void * montage_create_context(unsigned ticks, unsigned num_cpus, void *setup)
+static void * montage_create_context(unsigned ticks, unsigned num_cpus, til_setup_t *setup)
{
const til_module_t **modules, *rtv_module, *compose_module;
size_t n_modules;
@@ -88,7 +88,7 @@ static void * montage_create_context(unsigned ticks, unsigned num_cpus, void *se
for (size_t i = 0; i < ctxt->n_modules; i++) {
const til_module_t *module = ctxt->modules[i];
- void *setup = NULL;
+ til_setup_t *setup = NULL;
(void) til_module_randomize_setup(module, &setup, NULL);
© All Rights Reserved