[Bf-blender-cvs] [5a491adc17d] master: Cleanup: rename eChunkExecutionState to eWorkPackageState.
Jeroen Bakker
noreply at git.blender.org
Fri Apr 2 16:17:00 CEST 2021
Commit: 5a491adc17deb59f7c54fa60e5e8344b1daad359
Author: Jeroen Bakker
Date: Fri Apr 2 16:07:46 2021 +0200
Branches: master
https://developer.blender.org/rB5a491adc17deb59f7c54fa60e5e8344b1daad359
Cleanup: rename eChunkExecutionState to eWorkPackageState.
===================================================================
M source/blender/compositor/COM_compositor.h
M source/blender/compositor/intern/COM_CompositorContext.h
M source/blender/compositor/intern/COM_Enums.cc
M source/blender/compositor/intern/COM_Enums.h
M source/blender/compositor/intern/COM_ExecutionGroup.cc
M source/blender/compositor/intern/COM_WorkPackage.h
===================================================================
diff --git a/source/blender/compositor/COM_compositor.h b/source/blender/compositor/COM_compositor.h
index 300a06005ac..a7f9081f3fc 100644
--- a/source/blender/compositor/COM_compositor.h
+++ b/source/blender/compositor/COM_compositor.h
@@ -113,11 +113,11 @@ extern "C" {
*
* When the chunk-order is determined, the first few chunks will be checked if they can be scheduled.
* Chunks can have three states:
- * - [@ref eChunkExecutionState.NotScheduled]:
+ * - [@ref eWorkPackageState.NotScheduled]:
* Chunk is not yet scheduled, or dependencies are not met.
- * - [@ref eChunkExecutionState.Scheduled]:
+ * - [@ref eWorkPackageState.Scheduled]:
* All dependencies are met, chunk is scheduled, but not finished.
- * - [@ref eChunkExecutionState.Executed]:
+ * - [@ref eWorkPackageState.Executed]:
* Chunk is finished.
*
* \see ExecutionGroup.execute
diff --git a/source/blender/compositor/intern/COM_CompositorContext.h b/source/blender/compositor/intern/COM_CompositorContext.h
index 9abbda2ccd6..bdb1d4614f8 100644
--- a/source/blender/compositor/intern/COM_CompositorContext.h
+++ b/source/blender/compositor/intern/COM_CompositorContext.h
@@ -29,259 +29,258 @@
#include <string>
#include <vector>
- namespace blender::compositor
-{
+namespace blender::compositor {
+
+/**
+ * \brief Overall context of the compositor
+ */
+class CompositorContext {
+ private:
+ /**
+ * \brief The rendering field describes if we are rendering (F12) or if we are editing (Node
+ * editor) This field is initialized in ExecutionSystem and must only be read from that point
+ * on. \see ExecutionSystem
+ */
+ bool m_rendering;
+
+ /**
+ * \brief The quality of the composite.
+ * This field is initialized in ExecutionSystem and must only be read from that point on.
+ * \see ExecutionSystem
+ */
+ CompositorQuality m_quality;
+
+ Scene *m_scene;
+
+ /**
+ * \brief Reference to the render data that is being composited.
+ * This field is initialized in ExecutionSystem and must only be read from that point on.
+ * \see ExecutionSystem
+ */
+ RenderData *m_rd;
+
+ /**
+ * \brief reference to the bNodeTree
+ * This field is initialized in ExecutionSystem and must only be read from that point on.
+ * \see ExecutionSystem
+ */
+ bNodeTree *m_bnodetree;
+
+ /**
+ * \brief Preview image hash table
+ * This field is initialized in ExecutionSystem and must only be read from that point on.
+ */
+ bNodeInstanceHash *m_previews;
+
+ /**
+ * \brief does this system have active opencl devices?
+ */
+ bool m_hasActiveOpenCLDevices;
+
+ /**
+ * \brief Skip slow nodes
+ */
+ bool m_fastCalculation;
+
+ /* \brief color management settings */
+ const ColorManagedViewSettings *m_viewSettings;
+ const ColorManagedDisplaySettings *m_displaySettings;
+
+ /**
+ * \brief active rendering view name
+ */
+ const char *m_viewName;
+
+ public:
+ /**
+ * \brief constructor initializes the context with default values.
+ */
+ CompositorContext();
+
+ /**
+ * \brief set the rendering field of the context
+ */
+ void setRendering(bool rendering)
+ {
+ this->m_rendering = rendering;
+ }
+
+ /**
+ * \brief get the rendering field of the context
+ */
+ bool isRendering() const
+ {
+ return this->m_rendering;
+ }
+
+ /**
+ * \brief set the scene of the context
+ */
+ void setRenderData(RenderData *rd)
+ {
+ this->m_rd = rd;
+ }
+
+ /**
+ * \brief set the bnodetree of the context
+ */
+ void setbNodeTree(bNodeTree *bnodetree)
+ {
+ this->m_bnodetree = bnodetree;
+ }
+
+ /**
+ * \brief get the bnodetree of the context
+ */
+ const bNodeTree *getbNodeTree() const
+ {
+ return this->m_bnodetree;
+ }
+
+ /**
+ * \brief get the scene of the context
+ */
+ const RenderData *getRenderData() const
+ {
+ return this->m_rd;
+ }
+
+ void setScene(Scene *scene)
+ {
+ m_scene = scene;
+ }
+ Scene *getScene() const
+ {
+ return m_scene;
+ }
+
+ /**
+ * \brief set the preview image hash table
+ */
+ void setPreviewHash(bNodeInstanceHash *previews)
+ {
+ this->m_previews = previews;
+ }
+
+ /**
+ * \brief get the preview image hash table
+ */
+ bNodeInstanceHash *getPreviewHash() const
+ {
+ return this->m_previews;
+ }
+
+ /**
+ * \brief set view settings of color color management
+ */
+ void setViewSettings(const ColorManagedViewSettings *viewSettings)
+ {
+ this->m_viewSettings = viewSettings;
+ }
+
+ /**
+ * \brief get view settings of color color management
+ */
+ const ColorManagedViewSettings *getViewSettings() const
+ {
+ return this->m_viewSettings;
+ }
+
+ /**
+ * \brief set display settings of color color management
+ */
+ void setDisplaySettings(const ColorManagedDisplaySettings *displaySettings)
+ {
+ this->m_displaySettings = displaySettings;
+ }
+
+ /**
+ * \brief get display settings of color color management
+ */
+ const ColorManagedDisplaySettings *getDisplaySettings() const
+ {
+ return this->m_displaySettings;
+ }
+
+ /**
+ * \brief set the quality
+ */
+ void setQuality(CompositorQuality quality)
+ {
+ this->m_quality = quality;
+ }
+
+ /**
+ * \brief get the quality
+ */
+ CompositorQuality getQuality() const
+ {
+ return this->m_quality;
+ }
+
+ /**
+ * \brief get the current frame-number of the scene in this context
+ */
+ int getFramenumber() const;
+
+ /**
+ * \brief has this system active openclDevices?
+ */
+ bool getHasActiveOpenCLDevices() const
+ {
+ return this->m_hasActiveOpenCLDevices;
+ }
+
+ /**
+ * \brief set has this system active openclDevices?
+ */
+ void setHasActiveOpenCLDevices(bool hasAvtiveOpenCLDevices)
+ {
+ this->m_hasActiveOpenCLDevices = hasAvtiveOpenCLDevices;
+ }
+
+ /**
+ * \brief get the active rendering view
+ */
+ const char *getViewName() const
+ {
+ return this->m_viewName;
+ }
+
+ /**
+ * \brief set the active rendering view
+ */
+ void setViewName(const char *viewName)
+ {
+ this->m_viewName = viewName;
+ }
+
+ int getChunksize() const
+ {
+ return this->getbNodeTree()->chunksize;
+ }
+
+ void setFastCalculation(bool fastCalculation)
+ {
+ this->m_fastCalculation = fastCalculation;
+ }
+ bool isFastCalculation() const
+ {
+ return this->m_fastCalculation;
+ }
+ bool isGroupnodeBufferEnabled() const
+ {
+ return (this->getbNodeTree()->flag & NTREE_COM_GROUPNODE_BUFFER) != 0;
+ }
/**
- * \brief Overall context of the compositor
+ * \brief Get the render percentage as a factor.
+ * The compositor uses a factor i.o. a percentage.
*/
- class CompositorContext {
- private:
- /**
- * \brief The rendering field describes if we are rendering (F12) or if we are editing (Node
- * editor) This field is initialized in ExecutionSystem and must only be read from that point
- * on. \see ExecutionSystem
- */
- bool m_rendering;
-
- /**
- * \brief The quality of the composite.
- * This field is initialized in ExecutionSystem and must only be read from that point on.
- * \see ExecutionSystem
- */
- CompositorQuality m_quality;
-
- Scene *m_scene;
-
- /**
- * \brief Reference to the render data that is being composited.
- * This field is initialized in ExecutionSystem and must only be read from that point on.
- * \see ExecutionSystem
- */
- RenderData *m_rd;
-
- /**
- * \brief reference to the bNodeTree
- * This field is initialized in ExecutionSystem and must only be read from that point on.
- * \see ExecutionSystem
- */
- bNodeTree *m_bnodetree;
-
- /**
- * \brief Preview image hash table
- * This field is initialized in ExecutionSystem and must only be read from that point on.
- */
- bNodeInstanceHash *m_previews;
-
- /**
- * \brief does this system have active opencl devices?
- */
- bool m_hasActiveOpenCLDevices;
-
- /**
- * \brief Skip slow nodes
- */
- bool m_fastCalculation;
-
- /* \brief color management settings */
- const ColorManagedViewSettings *m_viewSettings;
- const ColorManagedDisplaySettings *m_displaySettings;
-
- /**
- * \brief active rendering view name
- */
- const char *m_viewName;
-
- public:
- /**
- * \brief constructor initializes the context with default values.
- */
- CompositorContext();
-
- /**
- * \brief set the rendering field of the context
- */
- void setRendering(bool rendering)
- {
- this->m_rendering = rendering;
- }
-
- /**
- * \brief get the rendering field of the context
- */
- bool isRendering() const
- {
- return this->m_rendering;
- }
-
- /**
- * \brief set the scene of the context
- */
- void setRenderData(RenderData *rd)
- {
- this->m_rd = rd;
- }
-
- /**
- * \brief set the bnodetree of the context
- */
- void setbNodeTree(bNodeTree *bnodetree)
- {
- this->m_bnodetree = bnodetree;
- }
-
- /**
- * \brief get the bnodetree of the context
- */
- const bNodeTree *getbNodeTree() const
- {
- return this->m_bnodetree;
- }
-
- /**
- * \brief get the scene of the context
- */
- const RenderData *getRenderData() const
- {
- return this->m_rd;
- }
-
- void setScene(Scene *scene)
- {
- m_scene = scene;
- }
- Scene *getScene() const
- {
- return m_scene;
- }
-
- /**
- * \brief set the preview image hash table
- */
- void setPreviewHash(bNodeInstanceHash *previews)
- {
- this->m_previews = previews;
- }
-
- /**
- * \brief get the preview image hash table
- */
- bNodeInstanceHash *getPreviewHash() const
- {
- return this->m_previews;
- }
-
- /**
- * \brief set view settings of color color management
- */
- void setViewSettings(const ColorManagedViewSettings *viewSettings)
- {
- this->m_viewSettings = viewSettings;
- }
-
- /**
- * \brief get view settings of color color management
- */
- const ColorManagedViewSettings *getViewSettings() const
- {
- return this->m_viewSe
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list