diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/compositor/intern/COM_compositor.cpp | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/compositor/intern/COM_compositor.cpp')
-rw-r--r-- | source/blender/compositor/intern/COM_compositor.cpp | 151 |
1 files changed, 77 insertions, 74 deletions
diff --git a/source/blender/compositor/intern/COM_compositor.cpp b/source/blender/compositor/intern/COM_compositor.cpp index 04fb550cf4b..50b578a9bc7 100644 --- a/source/blender/compositor/intern/COM_compositor.cpp +++ b/source/blender/compositor/intern/COM_compositor.cpp @@ -16,7 +16,6 @@ * Copyright 2011, Blender Foundation. */ - extern "C" { #include "BKE_node.h" #include "BLI_threads.h" @@ -35,85 +34,89 @@ extern "C" { static ThreadMutex s_compositorMutex; static bool is_compositorMutex_init = false; -void COM_execute(RenderData *rd, Scene *scene, bNodeTree *editingtree, int rendering, +void COM_execute(RenderData *rd, + Scene *scene, + bNodeTree *editingtree, + int rendering, const ColorManagedViewSettings *viewSettings, const ColorManagedDisplaySettings *displaySettings, const char *viewName) { - /* initialize mutex, TODO this mutex init is actually not thread safe and - * should be done somewhere as part of blender startup, all the other - * initializations can be done lazily */ - if (is_compositorMutex_init == false) { - BLI_mutex_init(&s_compositorMutex); - is_compositorMutex_init = true; - } - - BLI_mutex_lock(&s_compositorMutex); - - if (editingtree->test_break(editingtree->tbh)) { - // during editing multiple calls to this method can be triggered. - // make sure one the last one will be doing the work. - BLI_mutex_unlock(&s_compositorMutex); - return; - } - - /* Make sure node tree has previews. - * Don't create previews in advance, this is done when adding preview operations. - * Reserved preview size is determined by render output for now. - * - * We fit the aspect into COM_PREVIEW_SIZE x COM_PREVIEW_SIZE image to avoid - * insane preview resolution, which might even overflow preview dimensions. - */ - const float aspect = rd->xsch > 0 ? (float)rd->ysch / (float)rd->xsch : 1.0f; - int preview_width, preview_height; - if (aspect < 1.0f) { - preview_width = COM_PREVIEW_SIZE; - preview_height = (int)(COM_PREVIEW_SIZE * aspect); - } - else { - preview_width = (int)(COM_PREVIEW_SIZE / aspect); - preview_height = COM_PREVIEW_SIZE; - } - BKE_node_preview_init_tree(editingtree, preview_width, preview_height, false); - - /* initialize workscheduler, will check if already done. TODO deinitialize somewhere */ - bool use_opencl = (editingtree->flag & NTREE_COM_OPENCL) != 0; - WorkScheduler::initialize(use_opencl, BKE_render_num_threads(rd)); - - /* set progress bar to 0% and status to init compositing */ - editingtree->progress(editingtree->prh, 0.0); - editingtree->stats_draw(editingtree->sdh, IFACE_("Compositing")); - - bool twopass = (editingtree->flag & NTREE_TWO_PASS) && !rendering; - /* initialize execution system */ - if (twopass) { - ExecutionSystem *system = new ExecutionSystem(rd, scene, editingtree, rendering, twopass, viewSettings, displaySettings, viewName); - system->execute(); - delete system; - - if (editingtree->test_break(editingtree->tbh)) { - // during editing multiple calls to this method can be triggered. - // make sure one the last one will be doing the work. - BLI_mutex_unlock(&s_compositorMutex); - return; - } - } - - ExecutionSystem *system = new ExecutionSystem(rd, scene, editingtree, rendering, false, - viewSettings, displaySettings, viewName); - system->execute(); - delete system; - - BLI_mutex_unlock(&s_compositorMutex); + /* initialize mutex, TODO this mutex init is actually not thread safe and + * should be done somewhere as part of blender startup, all the other + * initializations can be done lazily */ + if (is_compositorMutex_init == false) { + BLI_mutex_init(&s_compositorMutex); + is_compositorMutex_init = true; + } + + BLI_mutex_lock(&s_compositorMutex); + + if (editingtree->test_break(editingtree->tbh)) { + // during editing multiple calls to this method can be triggered. + // make sure one the last one will be doing the work. + BLI_mutex_unlock(&s_compositorMutex); + return; + } + + /* Make sure node tree has previews. + * Don't create previews in advance, this is done when adding preview operations. + * Reserved preview size is determined by render output for now. + * + * We fit the aspect into COM_PREVIEW_SIZE x COM_PREVIEW_SIZE image to avoid + * insane preview resolution, which might even overflow preview dimensions. + */ + const float aspect = rd->xsch > 0 ? (float)rd->ysch / (float)rd->xsch : 1.0f; + int preview_width, preview_height; + if (aspect < 1.0f) { + preview_width = COM_PREVIEW_SIZE; + preview_height = (int)(COM_PREVIEW_SIZE * aspect); + } + else { + preview_width = (int)(COM_PREVIEW_SIZE / aspect); + preview_height = COM_PREVIEW_SIZE; + } + BKE_node_preview_init_tree(editingtree, preview_width, preview_height, false); + + /* initialize workscheduler, will check if already done. TODO deinitialize somewhere */ + bool use_opencl = (editingtree->flag & NTREE_COM_OPENCL) != 0; + WorkScheduler::initialize(use_opencl, BKE_render_num_threads(rd)); + + /* set progress bar to 0% and status to init compositing */ + editingtree->progress(editingtree->prh, 0.0); + editingtree->stats_draw(editingtree->sdh, IFACE_("Compositing")); + + bool twopass = (editingtree->flag & NTREE_TWO_PASS) && !rendering; + /* initialize execution system */ + if (twopass) { + ExecutionSystem *system = new ExecutionSystem( + rd, scene, editingtree, rendering, twopass, viewSettings, displaySettings, viewName); + system->execute(); + delete system; + + if (editingtree->test_break(editingtree->tbh)) { + // during editing multiple calls to this method can be triggered. + // make sure one the last one will be doing the work. + BLI_mutex_unlock(&s_compositorMutex); + return; + } + } + + ExecutionSystem *system = new ExecutionSystem( + rd, scene, editingtree, rendering, false, viewSettings, displaySettings, viewName); + system->execute(); + delete system; + + BLI_mutex_unlock(&s_compositorMutex); } void COM_deinitialize() { - if (is_compositorMutex_init) { - BLI_mutex_lock(&s_compositorMutex); - WorkScheduler::deinitialize(); - is_compositorMutex_init = false; - BLI_mutex_unlock(&s_compositorMutex); - BLI_mutex_end(&s_compositorMutex); - } + if (is_compositorMutex_init) { + BLI_mutex_lock(&s_compositorMutex); + WorkScheduler::deinitialize(); + is_compositorMutex_init = false; + BLI_mutex_unlock(&s_compositorMutex); + BLI_mutex_end(&s_compositorMutex); + } } |