summaryrefslogtreecommitdiff
path: root/src/modules/drizzle
diff options
context:
space:
mode:
authorVito Caputo <vcaputo@pengaru.com>2022-04-01 17:47:19 -0700
committerVito Caputo <vcaputo@pengaru.com>2022-04-01 17:59:03 -0700
commit6b8790a22c38e0d5419eb5a4dac5e30f684ae473 (patch)
tree444ac5369c34a705cd302862928ccad237d68bfe /src/modules/drizzle
parent78c275b094b63e01a5f7bc71af80fe787911bbf4 (diff)
modules/*: instantiate and use setups
Now modules allocate and return an opaque setup pointer in res_setup when they implement a setup method. Defaults are utilized when ${module}_create_context() receives a NULL setup. The default setup used in this case should match the defaults/preferred values emitted by the module's setup method. But performing setup should always be optional, so a NULL setup provided to create_context() is to be expected. No cleanup of these setup instances is currently performed, so it's a small memory leak for now. Since these are opaque and may contain nested references to other allocations, simply using free() somewhere in the frontend is insufficient. There will probably need to be something like a til_module_t.setup_free() method added in the future which modules may assign libc's free() to when appropriate, or their own more elaborate version. Lifecycle for the settings is very simple; the setup method returns an instance, the caller is expected to free it when no longer needed (once free is implemented). The create_context consumer of a given setup must make its own copy of the settings if necessary, and may not keep a reference - it must assume the setup will be freed immediately after create_context() returns. This enables the ability to reuse a setup instance across multiple create_context() calls if desired, one can imagine something like running the same module with the same settings multiple times across multiple displays for instance. If the module has significant entropy the output will differ despite being configured identically... With this commit one may change settings for any of the modules *while* the modules are actively rendering a given context, and the settings should *not* be visible. They should only affect the context they're supplied to.
Diffstat (limited to 'src/modules/drizzle')
-rw-r--r--src/modules/drizzle/drizzle.c38
1 files changed, 30 insertions, 8 deletions
diff --git a/src/modules/drizzle/drizzle.c b/src/modules/drizzle/drizzle.c
index 0a53492..d3d3c3e 100644
--- a/src/modules/drizzle/drizzle.c
+++ b/src/modules/drizzle/drizzle.c
@@ -14,6 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <errno.h>
#include <stdlib.h>
#include <unistd.h>
@@ -26,11 +27,6 @@
#define DRIZZLE_CNT 20
#define DEFAULT_VISCOSITY .01
-typedef struct drizzle_context_t {
- puddle_t *puddle;
- unsigned n_cpus;
-} drizzle_context_t;
-
typedef struct v3f_t {
float x, y, z;
} v3f_t;
@@ -39,7 +35,19 @@ typedef struct v2f_t {
float x, y;
} v2f_t;
-static float drizzle_viscosity = DEFAULT_VISCOSITY;
+typedef struct drizzle_setup_t {
+ float viscosity;
+} drizzle_setup_t;
+
+typedef struct drizzle_context_t {
+ puddle_t *puddle;
+ unsigned n_cpus;
+ drizzle_setup_t setup;
+} drizzle_context_t;
+
+static drizzle_setup_t drizzle_default_setup = {
+ .viscosity = DEFAULT_VISCOSITY,
+};
/* convert a color into a packed, 32-bit rgb pixel value (taken from libs/ray/ray_color.h) */
@@ -68,6 +76,9 @@ static void * drizzle_create_context(unsigned ticks, unsigned num_cpus, void *se
{
drizzle_context_t *ctxt;
+ if (!setup)
+ setup = &drizzle_default_setup;
+
ctxt = calloc(1, sizeof(drizzle_context_t));
if (!ctxt)
return NULL;
@@ -79,6 +90,7 @@ static void * drizzle_create_context(unsigned ticks, unsigned num_cpus, void *se
}
ctxt->n_cpus = num_cpus;
+ ctxt->setup = *(drizzle_setup_t *)setup;
return ctxt;
}
@@ -121,7 +133,7 @@ static void drizzle_prepare_frame(void *context, unsigned ticks, unsigned n_cpus
puddle_set(ctxt->puddle, x + 1, y + 1, 1.f);
}
- puddle_tick(ctxt->puddle, drizzle_viscosity);
+ puddle_tick(ctxt->puddle, ctxt->setup.viscosity);
}
@@ -180,7 +192,17 @@ static int drizzle_setup(const til_settings_t *settings, til_setting_t **res_set
if (r)
return r;
- sscanf(viscosity, "%f", &drizzle_viscosity);
+ if (res_setup) {
+ drizzle_setup_t *setup;
+
+ setup = calloc(1, sizeof(*setup));
+ if (!setup)
+ return -ENOMEM;
+
+ sscanf(viscosity, "%f", &setup->viscosity);
+
+ *res_setup = setup;
+ }
return 0;
}
© All Rights Reserved