diff options
author | Kent Mein <mein@cs.umn.edu> | 2008-04-18 23:10:03 +0400 |
---|---|---|
committer | Kent Mein <mein@cs.umn.edu> | 2008-04-18 23:10:03 +0400 |
commit | 981d380fc4704d56522dce0a8c2642b86a6458e0 (patch) | |
tree | e4f6aca0d12ccc30bf8c620dd945d5324b75271f /release/plugins/texture | |
parent | 4147a5a33d57178914227a45ddd1afb1746cdc49 (diff) |
This is an expanded patch of this:
[#8067] external texture plugin thread-safe modifications
Submitted By: David Anderson (davywavy)
It makes it so the "result" array is passed in, instead of a global var.
I expanded the patch so it will play nice with older plugins that are not
thread safe as well.
I also updated the existing plugins in the release, so they are thread safe.
--------------- What do people think of this.... ------------------
This should maybe be talked about in the functionality board or something,
but what do people think of adding in default texture/sequence plugins.
or making a seperate tree like lib for plugins.
The reason I ask is we have had a couple of upgrades to the plugin system.
(supporting float buffers for sequencer, and this one for textures)
http://www.cs.umn.edu/~mein/blender/plugins does not store revisions of
plugins I just make sure they work with the latest version. This is
getting messy. I haven't upgraded a lot of them to use floats (I know,
I'm lazy, and now this will also make modifications to the plugins)
It would be nice to have some of the standard ones under revision control.
We also seem to be having an explosion of platforms supported. It would
be nice to have platform maintainers compiling plugins as well for releases.
(Its getting to be more work for me to keep up with things...)
I'll go back to my corner now and be quite. ;)
Kent
Diffstat (limited to 'release/plugins/texture')
-rw-r--r-- | release/plugins/texture/clouds2.c | 6 | ||||
-rw-r--r-- | release/plugins/texture/tiles.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/release/plugins/texture/clouds2.c b/release/plugins/texture/clouds2.c index ff6a691adcb..1e7296e69c2 100644 --- a/release/plugins/texture/clouds2.c +++ b/release/plugins/texture/clouds2.c @@ -73,7 +73,7 @@ float result[8]; float cfra; -int plugin_tex_doit(int, Cast*, float*, float*, float*); +int plugin_tex_doit(int, Cast*, float*, float*, float*, float*); void plugin_instance_init(Cast*); /* ******************** Fixed functions ***************** */ @@ -114,7 +114,7 @@ void plugin_getinfo(PluginInfo *info) info->varstr= varstr; info->init= plugin_init; - info->tex_doit= (TexDoit) plugin_tex_doit; + info->tex_doit= (TexDoit) plugin_tex_doit; info->callback= plugin_but_changed; info->instance_init= (void (*)(void *)) plugin_instance_init; } @@ -122,7 +122,7 @@ void plugin_getinfo(PluginInfo *info) /* ********************* the texture ******************** */ -int plugin_tex_doit(int stype, Cast *cast, float *texvec, float *dxt, float *dyt) +int plugin_tex_doit(int stype, Cast *cast, float *texvec, float *dxt, float *dyt, float *result) { float val = 0.0; float a = 1.0; diff --git a/release/plugins/texture/tiles.c b/release/plugins/texture/tiles.c index d23ee037508..bc2bf3a8140 100644 --- a/release/plugins/texture/tiles.c +++ b/release/plugins/texture/tiles.c @@ -62,7 +62,7 @@ float result[8]; float cfra; -int plugin_tex_doit(int, Cast *, float *, float *, float *); +int plugin_tex_doit(int, Cast *, float *, float *, float *, float *); void plugin_instance_init(Cast*); /* ******************** Fixed functions ***************** */ @@ -150,7 +150,7 @@ float sample_wave(float freq, float coord, float pixsize) return retval; } -int plugin_tex_doit(int stype, Cast *cast, float *texvec, float *dxt, float *dyt) +int plugin_tex_doit(int stype, Cast *cast, float *texvec, float *dxt, float *dyt, float *result) { float xwave, ywave; |