[Bf-blender-cvs] [ba5961b4cda] master: Cleanup: use MIN2/MAX2 in compositor.
Jeroen Bakker
noreply at git.blender.org
Fri Mar 5 16:56:18 CET 2021
Commit: ba5961b4cda402389c7c3092a1bd092d9fd98bb2
Author: Jeroen Bakker
Date: Fri Mar 5 14:54:32 2021 +0100
Branches: master
https://developer.blender.org/rBba5961b4cda402389c7c3092a1bd092d9fd98bb2
Cleanup: use MIN2/MAX2 in compositor.
===================================================================
M source/blender/compositor/intern/COM_ExecutionGroup.cpp
M source/blender/compositor/intern/COM_MemoryBuffer.cpp
M source/blender/compositor/intern/COM_NodeOperation.cpp
M source/blender/compositor/intern/COM_NodeOperation.h
M source/blender/compositor/intern/COM_OpenCLDevice.cpp
M source/blender/compositor/intern/COM_OpenCLDevice.h
M source/blender/compositor/nodes/COM_SwitchViewNode.cpp
M source/blender/compositor/operations/COM_BokehBlurOperation.cpp
M source/blender/compositor/operations/COM_BokehBlurOperation.h
M source/blender/compositor/operations/COM_BoxMaskOperation.cpp
M source/blender/compositor/operations/COM_ChannelMatteOperation.cpp
M source/blender/compositor/operations/COM_ChannelMatteOperation.h
M source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cpp
M source/blender/compositor/operations/COM_ColorBalanceLGGOperation.cpp
M source/blender/compositor/operations/COM_ColorCorrectionOperation.cpp
M source/blender/compositor/operations/COM_ColorSpillOperation.cpp
M source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp
M source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.cpp
M source/blender/compositor/operations/COM_ConvolutionFilterOperation.cpp
M source/blender/compositor/operations/COM_CropOperation.cpp
M source/blender/compositor/operations/COM_DilateErodeOperation.cpp
M source/blender/compositor/operations/COM_DilateErodeOperation.h
M source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp
M source/blender/compositor/operations/COM_DirectionalBlurOperation.h
M source/blender/compositor/operations/COM_EllipseMaskOperation.cpp
M source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
M source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
M source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
M source/blender/compositor/operations/COM_GaussianXBlurOperation.h
M source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
M source/blender/compositor/operations/COM_GaussianYBlurOperation.h
M source/blender/compositor/operations/COM_GlareThresholdOperation.cpp
M source/blender/compositor/operations/COM_KeyingBlurOperation.cpp
M source/blender/compositor/operations/COM_KeyingDespillOperation.cpp
M source/blender/compositor/operations/COM_KeyingOperation.cpp
M source/blender/compositor/operations/COM_LuminanceMatteOperation.cpp
M source/blender/compositor/operations/COM_MaskOperation.h
M source/blender/compositor/operations/COM_MathBaseOperation.cpp
M source/blender/compositor/operations/COM_MixOperation.cpp
M source/blender/compositor/operations/COM_OpenCLKernels.cl
M source/blender/compositor/operations/COM_RotateOperation.cpp
M source/blender/compositor/operations/COM_SunBeamsOperation.cpp
M source/blender/compositor/operations/COM_TonemapOperation.cpp
M source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
M source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h
M source/blender/compositor/operations/COM_WriteBufferOperation.cpp
M source/blender/compositor/operations/COM_ZCombineOperation.cpp
===================================================================
diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.cpp b/source/blender/compositor/intern/COM_ExecutionGroup.cpp
index bc0dd4f4ad2..dc12248899d 100644
--- a/source/blender/compositor/intern/COM_ExecutionGroup.cpp
+++ b/source/blender/compositor/intern/COM_ExecutionGroup.cpp
@@ -143,7 +143,7 @@ void ExecutionGroup::initExecution()
if (operation->isReadBufferOperation()) {
ReadBufferOperation *readOperation = (ReadBufferOperation *)operation;
this->m_cachedReadOperations.push_back(readOperation);
- maxNumber = max(maxNumber, readOperation->getOffset());
+ maxNumber = MAX2(maxNumber, readOperation->getOffset());
}
}
maxNumber++;
@@ -452,13 +452,13 @@ inline void ExecutionGroup::determineChunkRect(rcti *rect,
else {
const unsigned int minx = xChunk * this->m_chunkSize + this->m_viewerBorder.xmin;
const unsigned int miny = yChunk * this->m_chunkSize + this->m_viewerBorder.ymin;
- const unsigned int width = min((unsigned int)this->m_viewerBorder.xmax, this->m_width);
- const unsigned int height = min((unsigned int)this->m_viewerBorder.ymax, this->m_height);
+ const unsigned int width = MIN2((unsigned int)this->m_viewerBorder.xmax, this->m_width);
+ const unsigned int height = MIN2((unsigned int)this->m_viewerBorder.ymax, this->m_height);
BLI_rcti_init(rect,
- min(minx, this->m_width),
- min(minx + this->m_chunkSize, width),
- min(miny, this->m_height),
- min(miny + this->m_chunkSize, height));
+ MIN2(minx, this->m_width),
+ MIN2(minx + this->m_chunkSize, width),
+ MIN2(miny, this->m_height),
+ MIN2(miny + this->m_chunkSize, height));
}
}
diff --git a/source/blender/compositor/intern/COM_MemoryBuffer.cpp b/source/blender/compositor/intern/COM_MemoryBuffer.cpp
index a13db6bb09e..17a73efeab2 100644
--- a/source/blender/compositor/intern/COM_MemoryBuffer.cpp
+++ b/source/blender/compositor/intern/COM_MemoryBuffer.cpp
@@ -20,9 +20,6 @@
#include "MEM_guardedalloc.h"
-using std::max;
-using std::min;
-
static unsigned int determine_num_channels(DataType datatype)
{
switch (datatype) {
@@ -156,10 +153,10 @@ void MemoryBuffer::copyContentFrom(MemoryBuffer *otherBuffer)
return;
}
unsigned int otherY;
- unsigned int minX = max(this->m_rect.xmin, otherBuffer->m_rect.xmin);
- unsigned int maxX = min(this->m_rect.xmax, otherBuffer->m_rect.xmax);
- unsigned int minY = max(this->m_rect.ymin, otherBuffer->m_rect.ymin);
- unsigned int maxY = min(this->m_rect.ymax, otherBuffer->m_rect.ymax);
+ unsigned int minX = MAX2(this->m_rect.xmin, otherBuffer->m_rect.xmin);
+ unsigned int maxX = MIN2(this->m_rect.xmax, otherBuffer->m_rect.xmax);
+ unsigned int minY = MAX2(this->m_rect.ymin, otherBuffer->m_rect.ymin);
+ unsigned int maxY = MIN2(this->m_rect.ymax, otherBuffer->m_rect.ymax);
int offset;
int otherOffset;
diff --git a/source/blender/compositor/intern/COM_NodeOperation.cpp b/source/blender/compositor/intern/COM_NodeOperation.cpp
index 1a30806f28c..ce7d3a6389e 100644
--- a/source/blender/compositor/intern/COM_NodeOperation.cpp
+++ b/source/blender/compositor/intern/COM_NodeOperation.cpp
@@ -182,10 +182,10 @@ bool NodeOperation::determineDependingAreaOfInterest(rcti *input,
first = false;
}
else {
- output->xmin = min(output->xmin, tempOutput.xmin);
- output->ymin = min(output->ymin, tempOutput.ymin);
- output->xmax = max(output->xmax, tempOutput.xmax);
- output->ymax = max(output->ymax, tempOutput.ymax);
+ output->xmin = MIN2(output->xmin, tempOutput.xmin);
+ output->ymin = MIN2(output->ymin, tempOutput.ymin);
+ output->xmax = MAX2(output->xmax, tempOutput.xmax);
+ output->ymax = MAX2(output->ymax, tempOutput.ymax);
}
}
}
diff --git a/source/blender/compositor/intern/COM_NodeOperation.h b/source/blender/compositor/intern/COM_NodeOperation.h
index 0ce7c1389bd..f26279e2869 100644
--- a/source/blender/compositor/intern/COM_NodeOperation.h
+++ b/source/blender/compositor/intern/COM_NodeOperation.h
@@ -33,10 +33,6 @@
#include "clew.h"
-using std::list;
-using std::max;
-using std::min;
-
class OpenCLDevice;
class ReadBufferOperation;
class WriteBufferOperation;
@@ -239,8 +235,8 @@ class NodeOperation : public SocketReader {
MemoryBuffer * /*outputMemoryBuffer*/,
cl_mem /*clOutputBuffer*/,
MemoryBuffer ** /*inputMemoryBuffers*/,
- list<cl_mem> * /*clMemToCleanUp*/,
- list<cl_kernel> * /*clKernelsToCleanUp*/)
+ std::list<cl_mem> * /*clMemToCleanUp*/,
+ std::list<cl_kernel> * /*clKernelsToCleanUp*/)
{
}
virtual void deinitExecution();
diff --git a/source/blender/compositor/intern/COM_OpenCLDevice.cpp b/source/blender/compositor/intern/COM_OpenCLDevice.cpp
index acfe800e433..2082c87da8c 100644
--- a/source/blender/compositor/intern/COM_OpenCLDevice.cpp
+++ b/source/blender/compositor/intern/COM_OpenCLDevice.cpp
@@ -79,7 +79,7 @@ void OpenCLDevice::execute(WorkPackage *work)
cl_mem OpenCLDevice::COM_clAttachMemoryBufferToKernelParameter(cl_kernel kernel,
int parameterIndex,
int offsetIndex,
- list<cl_mem> *cleanup,
+ std::list<cl_mem> *cleanup,
MemoryBuffer **inputMemoryBuffers,
SocketReader *reader)
{
@@ -111,7 +111,7 @@ const cl_image_format *OpenCLDevice::determineImageFormat(MemoryBuffer *memoryBu
cl_mem OpenCLDevice::COM_clAttachMemoryBufferToKernelParameter(cl_kernel kernel,
int parameterIndex,
int offsetIndex,
- list<cl_mem> *cleanup,
+ std::list<cl_mem> *cleanup,
MemoryBuffer **inputMemoryBuffers,
ReadBufferOperation *reader)
{
@@ -258,7 +258,7 @@ void OpenCLDevice::COM_clEnqueueRange(cl_kernel kernel,
}
cl_kernel OpenCLDevice::COM_clCreateKernel(const char *kernelname,
- list<cl_kernel> *clKernelsToCleanUp)
+ std::list<cl_kernel> *clKernelsToCleanUp)
{
cl_int error;
cl_kernel kernel = clCreateKernel(this->m_program, kernelname, &error);
diff --git a/source/blender/compositor/intern/COM_OpenCLDevice.h b/source/blender/compositor/intern/COM_OpenCLDevice.h
index d502f5aa34b..e4fd397b4e8 100644
--- a/source/blender/compositor/intern/COM_OpenCLDevice.h
+++ b/source/blender/compositor/intern/COM_OpenCLDevice.h
@@ -25,8 +25,6 @@ class OpenCLDevice;
#include "COM_WorkScheduler.h"
#include "clew.h"
-using std::list;
-
/**
* \brief device representing an GPU OpenCL device.
* an instance of this class represents a single cl_device
@@ -107,13 +105,13 @@ class OpenCLDevice : public Device {
cl_mem COM_clAttachMemoryBufferToKernelParameter(cl_kernel kernel,
int parameterIndex,
int offsetIndex,
- list<cl_mem> *cleanup,
+ std::list<cl_mem> *cleanup,
MemoryBuffer **inputMemoryBuffers,
SocketReader *reader);
cl_mem COM_clAttachMemoryBufferToKernelParameter(cl_kernel kernel,
int parameterIndex,
int offsetIndex,
- list<cl_mem> *cleanup,
+ std::list<cl_mem> *cleanup,
MemoryBuffer **inputMemoryBuffers,
ReadBufferOperation *reader);
void COM_clAttachMemoryBufferOffsetToKernelParameter(cl_kernel kernel,
@@ -130,5 +128,5 @@ class OpenCLDevice : public Device {
MemoryBuffer *outputMemoryBuffer,
int offsetIndex,
NodeOperation *operation);
- cl_kernel COM_clCreateKernel(const char *kernelname, list<cl_kernel> *clKernelsToCleanUp);
+ cl_kernel COM_clCreateKernel(const char *kernelname, std::list<cl_kernel> *clKernelsToCleanUp);
};
diff --git a/source/blender/compositor/nodes/COM_SwitchViewNode.cpp b/source/blender/compositor/nodes/COM_SwitchViewNode.cpp
index e4a946e2e9d..e534ebfac9a 100644
--- a/source/blender/compositor/nodes/COM_SwitchViewNode.cpp
+++ b/source/blender/compositor/nodes/COM_SwitchViewNode.cpp
@@ -33,7 +33,7 @@ void SwitchViewNode::convertToOperations(NodeConverter &converter,
/* get the internal index of the socket with a matching name */
int nr = BLI_findstringindex(&bnode->inputs, viewName, offsetof(bNodeSocket, name));
- nr = max(nr, 0);
+ nr = MAX2(nr, 0);
result = converter.addInputProxy(getInputSocket(nr), false);
converter.mapOutputSocket(getOutputSocket(0), result);
diff --git a/source/blender/compositor/operations/COM_BokehBlurOperation.cpp b/source/blender/compositor/operations/COM_BokehBlurOperation.cpp
index f7b7816e1a1..a8ad2a11790 100644
--- a/source/blender/compositor/operations/COM_BokehBlurOperation.cpp
+++ b/source/blender/compositor/operations/COM_BokehBlurOperation.cpp
@@ -62,7 +62,7 @@ void BokehBlurOperation::initExecution()
int
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list