diff options
22 files changed, 50 insertions, 50 deletions
diff --git a/source/blender/compositor/intern/COM_CompositorContext.cc b/source/blender/compositor/intern/COM_CompositorContext.cc index fdd47a6ca79..f70f3a8ebfc 100644 --- a/source/blender/compositor/intern/COM_CompositorContext.cc +++ b/source/blender/compositor/intern/COM_CompositorContext.cc @@ -28,7 +28,7 @@ CompositorContext::CompositorContext() { this->m_scene = nullptr; this->m_rd = nullptr; - this->m_quality = CompositorQuality::High; + this->m_quality = eCompositorQuality::High; this->m_hasActiveOpenCLDevices = false; this->m_fastCalculation = false; this->m_viewSettings = nullptr; diff --git a/source/blender/compositor/intern/COM_CompositorContext.h b/source/blender/compositor/intern/COM_CompositorContext.h index bdb1d4614f8..e6164246bdd 100644 --- a/source/blender/compositor/intern/COM_CompositorContext.h +++ b/source/blender/compositor/intern/COM_CompositorContext.h @@ -48,7 +48,7 @@ class CompositorContext { * This field is initialized in ExecutionSystem and must only be read from that point on. * \see ExecutionSystem */ - CompositorQuality m_quality; + eCompositorQuality m_quality; Scene *m_scene; @@ -205,7 +205,7 @@ class CompositorContext { /** * \brief set the quality */ - void setQuality(CompositorQuality quality) + void setQuality(eCompositorQuality quality) { this->m_quality = quality; } @@ -213,7 +213,7 @@ class CompositorContext { /** * \brief get the quality */ - CompositorQuality getQuality() const + eCompositorQuality getQuality() const { return this->m_quality; } diff --git a/source/blender/compositor/intern/COM_Enums.cc b/source/blender/compositor/intern/COM_Enums.cc index 68fd5c9ef93..d218de92544 100644 --- a/source/blender/compositor/intern/COM_Enums.cc +++ b/source/blender/compositor/intern/COM_Enums.cc @@ -20,18 +20,18 @@ namespace blender::compositor { -std::ostream &operator<<(std::ostream &os, const CompositorPriority &priority) +std::ostream &operator<<(std::ostream &os, const eCompositorPriority &priority) { switch (priority) { - case CompositorPriority::High: { + case eCompositorPriority::High: { os << "Priority::High"; break; } - case CompositorPriority::Medium: { + case eCompositorPriority::Medium: { os << "Priority::Medium"; break; } - case CompositorPriority::Low: { + case eCompositorPriority::Low: { os << "Priority::Low"; break; } diff --git a/source/blender/compositor/intern/COM_Enums.h b/source/blender/compositor/intern/COM_Enums.h index b0276b4b3d9..f65ce3e856e 100644 --- a/source/blender/compositor/intern/COM_Enums.h +++ b/source/blender/compositor/intern/COM_Enums.h @@ -29,7 +29,7 @@ namespace blender::compositor { * \see CompositorContext.quality * \ingroup Execution */ -enum class CompositorQuality { +enum class eCompositorQuality { /** \brief High quality setting */ High = 0, /** \brief Medium quality setting */ @@ -42,7 +42,7 @@ enum class CompositorQuality { * \brief Possible priority settings * \ingroup Execution */ -enum class CompositorPriority { +enum class eCompositorPriority { /** \brief High quality setting */ High = 2, /** \brief Medium quality setting */ @@ -70,7 +70,7 @@ enum class eWorkPackageState { Executed = 2, }; -std::ostream &operator<<(std::ostream &os, const CompositorPriority &priority); +std::ostream &operator<<(std::ostream &os, const eCompositorPriority &priority); std::ostream &operator<<(std::ostream &os, const eWorkPackageState &execution_state); } // namespace blender::compositor diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.cc b/source/blender/compositor/intern/COM_ExecutionGroup.cc index e18be191da4..80d453bf7f9 100644 --- a/source/blender/compositor/intern/COM_ExecutionGroup.cc +++ b/source/blender/compositor/intern/COM_ExecutionGroup.cc @@ -92,7 +92,7 @@ std::ostream &operator<<(std::ostream &os, const ExecutionGroup &execution_group return os; } -CompositorPriority ExecutionGroup::getRenderPriority() +eCompositorPriority ExecutionGroup::getRenderPriority() { return this->getOutputOperation()->getRenderPriority(); } diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.h b/source/blender/compositor/intern/COM_ExecutionGroup.h index ebe942402f9..f9cbceffd3e 100644 --- a/source/blender/compositor/intern/COM_ExecutionGroup.h +++ b/source/blender/compositor/intern/COM_ExecutionGroup.h @@ -389,7 +389,7 @@ class ExecutionGroup { * \brief get the Render priority of this ExecutionGroup * \see ExecutionSystem.execute */ - CompositorPriority getRenderPriority(); + eCompositorPriority getRenderPriority(); /** * \brief set border for viewer operation diff --git a/source/blender/compositor/intern/COM_ExecutionSystem.cc b/source/blender/compositor/intern/COM_ExecutionSystem.cc index 9a3dc6ee56f..cb8c1b9326d 100644 --- a/source/blender/compositor/intern/COM_ExecutionSystem.cc +++ b/source/blender/compositor/intern/COM_ExecutionSystem.cc @@ -55,10 +55,10 @@ ExecutionSystem::ExecutionSystem(RenderData *rd, this->m_context.setFastCalculation(fastcalculation); /* initialize the CompositorContext */ if (rendering) { - this->m_context.setQuality((CompositorQuality)editingtree->render_quality); + this->m_context.setQuality((eCompositorQuality)editingtree->render_quality); } else { - this->m_context.setQuality((CompositorQuality)editingtree->edit_quality); + this->m_context.setQuality((eCompositorQuality)editingtree->edit_quality); } this->m_context.setRendering(rendering); this->m_context.setHasActiveOpenCLDevices(WorkScheduler::has_gpu_devices() && @@ -193,10 +193,10 @@ void ExecutionSystem::execute() init_execution_groups_for_execution(m_groups, m_context.getChunksize()); WorkScheduler::start(this->m_context); - execute_groups(CompositorPriority::High); + execute_groups(eCompositorPriority::High); if (!this->getContext().isFastCalculation()) { - execute_groups(CompositorPriority::Medium); - execute_groups(CompositorPriority::Low); + execute_groups(eCompositorPriority::Medium); + execute_groups(eCompositorPriority::Low); } WorkScheduler::finish(); WorkScheduler::stop(); @@ -212,7 +212,7 @@ void ExecutionSystem::execute() } } -void ExecutionSystem::execute_groups(CompositorPriority priority) +void ExecutionSystem::execute_groups(eCompositorPriority priority) { for (ExecutionGroup *execution_group : m_groups) { if (execution_group->get_flags().is_output && diff --git a/source/blender/compositor/intern/COM_ExecutionSystem.h b/source/blender/compositor/intern/COM_ExecutionSystem.h index b8dcd90e1a6..672bda68668 100644 --- a/source/blender/compositor/intern/COM_ExecutionSystem.h +++ b/source/blender/compositor/intern/COM_ExecutionSystem.h @@ -179,7 +179,7 @@ class ExecutionSystem { } private: - void execute_groups(CompositorPriority priority); + void execute_groups(eCompositorPriority priority); /* allow the DebugInfo class to look at internals */ friend class DebugInfo; diff --git a/source/blender/compositor/intern/COM_NodeOperation.h b/source/blender/compositor/intern/COM_NodeOperation.h index 7e388fba2b1..a613955d21a 100644 --- a/source/blender/compositor/intern/COM_NodeOperation.h +++ b/source/blender/compositor/intern/COM_NodeOperation.h @@ -452,11 +452,11 @@ class NodeOperation { /** * \brief get the render priority of this node. * \note only applicable for output operations like ViewerOperation - * \return CompositorPriority + * \return eCompositorPriority */ - virtual CompositorPriority getRenderPriority() const + virtual eCompositorPriority getRenderPriority() const { - return CompositorPriority::Low; + return eCompositorPriority::Low; } inline bool isBraked() const diff --git a/source/blender/compositor/nodes/COM_BlurNode.cc b/source/blender/compositor/nodes/COM_BlurNode.cc index e55a594b9c0..c10bc2a05f0 100644 --- a/source/blender/compositor/nodes/COM_BlurNode.cc +++ b/source/blender/compositor/nodes/COM_BlurNode.cc @@ -47,7 +47,7 @@ void BlurNode::convertToOperations(NodeConverter &converter, const float size = this->getInputSocket(1)->getEditorValueFloat(); const bool extend_bounds = (editorNode->custom1 & CMP_NODEFLAG_BLUR_EXTEND_BOUNDS) != 0; - CompositorQuality quality = context.getQuality(); + eCompositorQuality quality = context.getQuality(); NodeOperation *input_operation = nullptr, *output_operation = nullptr; if (data->filtertype == R_FILTER_FAST_GAUSS) { diff --git a/source/blender/compositor/nodes/COM_DefocusNode.cc b/source/blender/compositor/nodes/COM_DefocusNode.cc index fee7c477d9c..2023e4f7118 100644 --- a/source/blender/compositor/nodes/COM_DefocusNode.cc +++ b/source/blender/compositor/nodes/COM_DefocusNode.cc @@ -112,7 +112,7 @@ void DefocusNode::convertToOperations(NodeConverter &converter, VariableSizeBokehBlurOperation *operation = new VariableSizeBokehBlurOperation(); if (data->preview) { - operation->setQuality(CompositorQuality::Low); + operation->setQuality(eCompositorQuality::Low); } else { operation->setQuality(context.getQuality()); diff --git a/source/blender/compositor/nodes/COM_DilateErodeNode.cc b/source/blender/compositor/nodes/COM_DilateErodeNode.cc index 81af1687959..1867014f64b 100644 --- a/source/blender/compositor/nodes/COM_DilateErodeNode.cc +++ b/source/blender/compositor/nodes/COM_DilateErodeNode.cc @@ -85,7 +85,7 @@ void DilateErodeNode::convertToOperations(NodeConverter &converter, } else if (editorNode->custom1 == CMP_NODE_DILATEERODE_DISTANCE_FEATHER) { /* this uses a modified gaussian blur function otherwise its far too slow */ - CompositorQuality quality = context.getQuality(); + eCompositorQuality quality = context.getQuality(); GaussianAlphaXBlurOperation *operationx = new GaussianAlphaXBlurOperation(); operationx->setData(&m_alpha_blur); diff --git a/source/blender/compositor/nodes/COM_DisplaceNode.cc b/source/blender/compositor/nodes/COM_DisplaceNode.cc index 8217caecf44..f2ec750c595 100644 --- a/source/blender/compositor/nodes/COM_DisplaceNode.cc +++ b/source/blender/compositor/nodes/COM_DisplaceNode.cc @@ -32,7 +32,7 @@ void DisplaceNode::convertToOperations(NodeConverter &converter, const CompositorContext &context) const { NodeOperation *operation; - if (context.getQuality() == CompositorQuality::Low) { + if (context.getQuality() == eCompositorQuality::Low) { operation = new DisplaceSimpleOperation(); } else { diff --git a/source/blender/compositor/nodes/COM_KeyingNode.cc b/source/blender/compositor/nodes/COM_KeyingNode.cc index 2054ed67190..0af328a3601 100644 --- a/source/blender/compositor/nodes/COM_KeyingNode.cc +++ b/source/blender/compositor/nodes/COM_KeyingNode.cc @@ -144,7 +144,7 @@ NodeOperationOutput *KeyingNode::setupFeather(NodeConverter &converter, int distance) const { /* this uses a modified gaussian blur function otherwise its far too slow */ - CompositorQuality quality = context.getQuality(); + eCompositorQuality quality = context.getQuality(); /* initialize node data */ NodeBlurData data; diff --git a/source/blender/compositor/operations/COM_CompositorOperation.h b/source/blender/compositor/operations/COM_CompositorOperation.h index 49ed65f01fc..65988c86cc5 100644 --- a/source/blender/compositor/operations/COM_CompositorOperation.h +++ b/source/blender/compositor/operations/COM_CompositorOperation.h @@ -111,9 +111,9 @@ class CompositorOperation : public NodeOperation { } void initExecution() override; void deinitExecution() override; - CompositorPriority getRenderPriority() const override + eCompositorPriority getRenderPriority() const override { - return CompositorPriority::Medium; + return eCompositorPriority::Medium; } void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]) override; diff --git a/source/blender/compositor/operations/COM_OutputFileOperation.h b/source/blender/compositor/operations/COM_OutputFileOperation.h index 6415891032a..03e4237a1f0 100644 --- a/source/blender/compositor/operations/COM_OutputFileOperation.h +++ b/source/blender/compositor/operations/COM_OutputFileOperation.h @@ -66,9 +66,9 @@ class OutputSingleLayerOperation : public NodeOperation { } void initExecution() override; void deinitExecution() override; - CompositorPriority getRenderPriority() const override + eCompositorPriority getRenderPriority() const override { - return CompositorPriority::Low; + return eCompositorPriority::Low; } }; @@ -118,9 +118,9 @@ class OutputOpenExrMultiLayerOperation : public NodeOperation { } void initExecution() override; void deinitExecution() override; - CompositorPriority getRenderPriority() const override + eCompositorPriority getRenderPriority() const override { - return CompositorPriority::Low; + return eCompositorPriority::Low; } }; diff --git a/source/blender/compositor/operations/COM_PreviewOperation.cc b/source/blender/compositor/operations/COM_PreviewOperation.cc index 9a1990740f4..e7c11613aa3 100644 --- a/source/blender/compositor/operations/COM_PreviewOperation.cc +++ b/source/blender/compositor/operations/COM_PreviewOperation.cc @@ -166,9 +166,9 @@ void PreviewOperation::determineResolution(unsigned int resolution[2], resolution[1] = height; } -CompositorPriority PreviewOperation::getRenderPriority() const +eCompositorPriority PreviewOperation::getRenderPriority() const { - return CompositorPriority::Low; + return eCompositorPriority::Low; } } // namespace blender::compositor diff --git a/source/blender/compositor/operations/COM_PreviewOperation.h b/source/blender/compositor/operations/COM_PreviewOperation.h index 5e2b27475a1..0f43f01c5d6 100644 --- a/source/blender/compositor/operations/COM_PreviewOperation.h +++ b/source/blender/compositor/operations/COM_PreviewOperation.h @@ -55,7 +55,7 @@ class PreviewOperation : public NodeOperation { } void initExecution() override; void deinitExecution() override; - CompositorPriority getRenderPriority() const override; + eCompositorPriority getRenderPriority() const override; void executeRegion(rcti *rect, unsigned int tileNumber) override; void determineResolution(unsigned int resolution[2], diff --git a/source/blender/compositor/operations/COM_QualityStepHelper.cc b/source/blender/compositor/operations/COM_QualityStepHelper.cc index 385e0bebca4..e347d278ce4 100644 --- a/source/blender/compositor/operations/COM_QualityStepHelper.cc +++ b/source/blender/compositor/operations/COM_QualityStepHelper.cc @@ -22,7 +22,7 @@ namespace blender::compositor { QualityStepHelper::QualityStepHelper() { - this->m_quality = CompositorQuality::High; + this->m_quality = eCompositorQuality::High; this->m_step = 1; this->m_offsetadd = 4; } @@ -32,16 +32,16 @@ void QualityStepHelper::initExecution(QualityHelper helper) switch (helper) { case COM_QH_INCREASE: switch (this->m_quality) { - case CompositorQuality::High: + case eCompositorQuality::High: default: this->m_step = 1; this->m_offsetadd = 1; break; - case CompositorQuality::Medium: + case eCompositorQuality::Medium: this->m_step = 2; this->m_offsetadd = 2; break; - case CompositorQuality::Low: + case eCompositorQuality::Low: this->m_step = 3; this->m_offsetadd = 3; break; @@ -49,16 +49,16 @@ void QualityStepHelper::initExecution(QualityHelper helper) break; case COM_QH_MULTIPLY: switch (this->m_quality) { - case CompositorQuality::High: + case eCompositorQuality::High: default: this->m_step = 1; this->m_offsetadd = 4; break; - case CompositorQuality::Medium: + case eCompositorQuality::Medium: this->m_step = 2; this->m_offsetadd = 8; break; - case CompositorQuality::Low: + case eCompositorQuality::Low: this->m_step = 4; this->m_offsetadd = 16; break; diff --git a/source/blender/compositor/operations/COM_QualityStepHelper.h b/source/blender/compositor/operations/COM_QualityStepHelper.h index 79c761e6086..c5f16a58686 100644 --- a/source/blender/compositor/operations/COM_QualityStepHelper.h +++ b/source/blender/compositor/operations/COM_QualityStepHelper.h @@ -29,7 +29,7 @@ typedef enum QualityHelper { class QualityStepHelper { private: - CompositorQuality m_quality; + eCompositorQuality m_quality; int m_step; int m_offsetadd; @@ -51,7 +51,7 @@ class QualityStepHelper { public: QualityStepHelper(); - void setQuality(CompositorQuality quality) + void setQuality(eCompositorQuality quality) { this->m_quality = quality; } diff --git a/source/blender/compositor/operations/COM_ViewerOperation.cc b/source/blender/compositor/operations/COM_ViewerOperation.cc index 1ae0fe6101f..860f56e23fa 100644 --- a/source/blender/compositor/operations/COM_ViewerOperation.cc +++ b/source/blender/compositor/operations/COM_ViewerOperation.cc @@ -209,13 +209,13 @@ void ViewerOperation::updateImage(rcti *rect) this->updateDraw(); } -CompositorPriority ViewerOperation::getRenderPriority() const +eCompositorPriority ViewerOperation::getRenderPriority() const { if (this->isActiveViewerOutput()) { - return CompositorPriority::High; + return eCompositorPriority::High; } - return CompositorPriority::Low; + return eCompositorPriority::Low; } } // namespace blender::compositor diff --git a/source/blender/compositor/operations/COM_ViewerOperation.h b/source/blender/compositor/operations/COM_ViewerOperation.h index 8406ea41f20..c0f13ff79fc 100644 --- a/source/blender/compositor/operations/COM_ViewerOperation.h +++ b/source/blender/compositor/operations/COM_ViewerOperation.h @@ -102,7 +102,7 @@ class ViewerOperation : public NodeOperation { { return this->m_chunkOrder; } - CompositorPriority getRenderPriority() const override; + eCompositorPriority getRenderPriority() const override; void setUseAlphaInput(bool value) { this->m_useAlphaInput = value; |