diff options
| author | Ton Roosendaal <ton@blender.org> | 2006-02-24 13:20:31 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2006-02-24 13:20:31 +0300 |
| commit | 7930c40051ef1b1a26140629cf1299aa89eed859 (patch) | |
| tree | fd3508802ebe1a99704bdbeb433d89ff3cdbc572 /source/blender/render/extern | |
| parent | 3bd57e6a6496ab17dfd6a59777d3f5be69b8d1dd (diff) | |
Made the most critical variables in render pipeline "volatile", especially
the ones that get changed within threads, to communicate with the main
thread.
(Part of the long quest to get threaded render safe, especially in Linux)
Diffstat (limited to 'source/blender/render/extern')
| -rw-r--r-- | source/blender/render/extern/include/RE_pipeline.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h index ad3d93cd908..9412c4cb6a8 100644 --- a/source/blender/render/extern/include/RE_pipeline.h +++ b/source/blender/render/extern/include/RE_pipeline.h @@ -98,8 +98,8 @@ typedef struct RenderResult { ListBase layers; /* allowing live updates: */ - rcti renrect; - RenderLayer *renlay; + volatile rcti renrect; + volatile RenderLayer *renlay; /* optional saved endresult on disk */ char exrfile[FILE_MAXDIR]; @@ -166,7 +166,7 @@ void RE_BlenderAnim(struct Render *re, struct Scene *scene, int sfra, int efra); /* display and event callbacks */ void RE_display_init_cb (struct Render *re, void (*f)(RenderResult *rr)); void RE_display_clear_cb(struct Render *re, void (*f)(RenderResult *rr)); -void RE_display_draw_cb (struct Render *re, void (*f)(RenderResult *rr, struct rcti *rect)); +void RE_display_draw_cb (struct Render *re, void (*f)(RenderResult *rr, volatile struct rcti *rect)); void RE_stats_draw_cb (struct Render *re, void (*f)(RenderStats *rs)); void RE_timecursor_cb (struct Render *re, void (*f)(int)); void RE_test_break_cb (struct Render *re, int (*f)(void)); |