[Bf-blender-cvs] [dc9aea9903d] master: Cleanup: Add copy constructor to MemoryBuffer.
Jeroen Bakker
noreply at git.blender.org
Fri Mar 19 17:18:39 CET 2021
Commit: dc9aea9903d2af0b4333fcc6992fc9ea8e72876e
Author: Jeroen Bakker
Date: Fri Mar 19 16:07:32 2021 +0100
Branches: master
https://developer.blender.org/rBdc9aea9903d2af0b4333fcc6992fc9ea8e72876e
Cleanup: Add copy constructor to MemoryBuffer.
===================================================================
M source/blender/compositor/intern/COM_MemoryBuffer.cc
M source/blender/compositor/intern/COM_MemoryBuffer.h
M source/blender/compositor/operations/COM_FastGaussianBlurOperation.cc
M source/blender/compositor/operations/COM_GlareGhostOperation.cc
M source/blender/compositor/operations/COM_GlareSimpleStarOperation.cc
M source/blender/compositor/operations/COM_GlareStreaksOperation.cc
===================================================================
diff --git a/source/blender/compositor/intern/COM_MemoryBuffer.cc b/source/blender/compositor/intern/COM_MemoryBuffer.cc
index 46c99623244..2664612beed 100644
--- a/source/blender/compositor/intern/COM_MemoryBuffer.cc
+++ b/source/blender/compositor/intern/COM_MemoryBuffer.cc
@@ -74,6 +74,7 @@ MemoryBuffer::MemoryBuffer(MemoryProxy *memoryProxy, const rcti &rect)
this->m_state = COM_MB_TEMPORARILY;
this->m_datatype = memoryProxy->getDataType();
}
+
MemoryBuffer::MemoryBuffer(DataType dataType, const rcti &rect)
{
m_rect = rect;
@@ -88,14 +89,17 @@ MemoryBuffer::MemoryBuffer(DataType dataType, const rcti &rect)
this->m_state = COM_MB_TEMPORARILY;
this->m_datatype = dataType;
}
-MemoryBuffer *MemoryBuffer::duplicate()
+
+MemoryBuffer::MemoryBuffer(const MemoryBuffer &src) : MemoryBuffer(src.m_memoryProxy, src.m_rect)
{
- MemoryBuffer *result = new MemoryBuffer(this->m_memoryProxy, this->m_rect);
- memcpy(result->m_buffer,
- this->m_buffer,
- this->determineBufferSize() * this->m_num_channels * sizeof(float));
- return result;
+ memcpy(m_buffer, src.m_buffer, determineBufferSize() * m_num_channels * sizeof(float));
}
+
+// MemoryBuffer *MemoryBuffer::duplicate()
+// {
+// return new MemoryBuffer(*this);
+// }
+
void MemoryBuffer::clear()
{
memset(this->m_buffer, 0, this->determineBufferSize() * this->m_num_channels * sizeof(float));
diff --git a/source/blender/compositor/intern/COM_MemoryBuffer.h b/source/blender/compositor/intern/COM_MemoryBuffer.h
index b80124ca136..e19837b49c2 100644
--- a/source/blender/compositor/intern/COM_MemoryBuffer.h
+++ b/source/blender/compositor/intern/COM_MemoryBuffer.h
@@ -110,6 +110,11 @@ class MemoryBuffer {
*/
MemoryBuffer(DataType datatype, const rcti &rect);
+ /**
+ * Copy constructor
+ */
+ MemoryBuffer(const MemoryBuffer &src);
+
/**
* \brief destructor
*/
@@ -339,8 +344,6 @@ class MemoryBuffer {
*/
void clear();
- MemoryBuffer *duplicate();
-
float getMaximumValue();
float getMaximumValue(rcti *rect);
diff --git a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cc b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cc
index c896cfcc49f..922d6a859a3 100644
--- a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cc
+++ b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cc
@@ -80,7 +80,7 @@ void *FastGaussianBlurOperation::initializeTileData(rcti *rect)
lockMutex();
if (!this->m_iirgaus) {
MemoryBuffer *newBuf = (MemoryBuffer *)this->m_inputProgram->initializeTileData(rect);
- MemoryBuffer *copy = newBuf->duplicate();
+ MemoryBuffer *copy = new MemoryBuffer(*newBuf);
updateSize();
int c;
@@ -310,7 +310,7 @@ void *FastGaussianBlurValueOperation::initializeTileData(rcti *rect)
lockMutex();
if (!this->m_iirgaus) {
MemoryBuffer *newBuf = (MemoryBuffer *)this->m_inputprogram->initializeTileData(rect);
- MemoryBuffer *copy = newBuf->duplicate();
+ MemoryBuffer *copy = new MemoryBuffer(*newBuf);
FastGaussianBlurOperation::IIR_gauss(copy, this->m_sigma, 0, 3);
if (this->m_overlay == FAST_GAUSS_OVERLAY_MIN) {
diff --git a/source/blender/compositor/operations/COM_GlareGhostOperation.cc b/source/blender/compositor/operations/COM_GlareGhostOperation.cc
index 760b833d1e1..a4cd6dc60c1 100644
--- a/source/blender/compositor/operations/COM_GlareGhostOperation.cc
+++ b/source/blender/compositor/operations/COM_GlareGhostOperation.cc
@@ -41,41 +41,41 @@ void GlareGhostOperation::generateGlare(float *data, MemoryBuffer *inputTile, No
float sc, isc, u, v, sm, s, t, ofs, scalef[64];
const float cmo = 1.0f - settings->colmod;
- MemoryBuffer *gbuf = inputTile->duplicate();
- MemoryBuffer *tbuf1 = inputTile->duplicate();
+ MemoryBuffer gbuf(*inputTile);
+ MemoryBuffer tbuf1(*inputTile);
bool breaked = false;
- FastGaussianBlurOperation::IIR_gauss(tbuf1, s1, 0, 3);
+ FastGaussianBlurOperation::IIR_gauss(&tbuf1, s1, 0, 3);
if (!breaked) {
- FastGaussianBlurOperation::IIR_gauss(tbuf1, s1, 1, 3);
+ FastGaussianBlurOperation::IIR_gauss(&tbuf1, s1, 1, 3);
}
if (isBraked()) {
breaked = true;
}
if (!breaked) {
- FastGaussianBlurOperation::IIR_gauss(tbuf1, s1, 2, 3);
+ FastGaussianBlurOperation::IIR_gauss(&tbuf1, s1, 2, 3);
}
- MemoryBuffer *tbuf2 = tbuf1->duplicate();
+ MemoryBuffer tbuf2(tbuf1);
if (isBraked()) {
breaked = true;
}
if (!breaked) {
- FastGaussianBlurOperation::IIR_gauss(tbuf2, s2, 0, 3);
+ FastGaussianBlurOperation::IIR_gauss(&tbuf2, s2, 0, 3);
}
if (isBraked()) {
breaked = true;
}
if (!breaked) {
- FastGaussianBlurOperation::IIR_gauss(tbuf2, s2, 1, 3);
+ FastGaussianBlurOperation::IIR_gauss(&tbuf2, s2, 1, 3);
}
if (isBraked()) {
breaked = true;
}
if (!breaked) {
- FastGaussianBlurOperation::IIR_gauss(tbuf2, s2, 2, 3);
+ FastGaussianBlurOperation::IIR_gauss(&tbuf2, s2, 2, 3);
}
ofs = (settings->iter & 1) ? 0.5f : 0.0f;
@@ -99,61 +99,57 @@ void GlareGhostOperation::generateGlare(float *data, MemoryBuffer *inputTile, No
sc = 2.13;
isc = -0.97;
- for (y = 0; y < gbuf->getHeight() && (!breaked); y++) {
- v = ((float)y + 0.5f) / (float)gbuf->getHeight();
- for (x = 0; x < gbuf->getWidth(); x++) {
- u = ((float)x + 0.5f) / (float)gbuf->getWidth();
+ for (y = 0; y < gbuf.getHeight() && (!breaked); y++) {
+ v = ((float)y + 0.5f) / (float)gbuf.getHeight();
+ for (x = 0; x < gbuf.getWidth(); x++) {
+ u = ((float)x + 0.5f) / (float)gbuf.getWidth();
s = (u - 0.5f) * sc + 0.5f;
t = (v - 0.5f) * sc + 0.5f;
- tbuf1->readBilinear(c, s * gbuf->getWidth(), t * gbuf->getHeight());
+ tbuf1.readBilinear(c, s * gbuf.getWidth(), t * gbuf.getHeight());
sm = smoothMask(s, t);
mul_v3_fl(c, sm);
s = (u - 0.5f) * isc + 0.5f;
t = (v - 0.5f) * isc + 0.5f;
- tbuf2->readBilinear(tc, s * gbuf->getWidth() - 0.5f, t * gbuf->getHeight() - 0.5f);
+ tbuf2.readBilinear(tc, s * gbuf.getWidth() - 0.5f, t * gbuf.getHeight() - 0.5f);
sm = smoothMask(s, t);
madd_v3_v3fl(c, tc, sm);
- gbuf->writePixel(x, y, c);
+ gbuf.writePixel(x, y, c);
}
if (isBraked()) {
breaked = true;
}
}
- memset(tbuf1->getBuffer(),
+ memset(tbuf1.getBuffer(),
0,
- tbuf1->getWidth() * tbuf1->getHeight() * COM_NUM_CHANNELS_COLOR * sizeof(float));
+ tbuf1.getWidth() * tbuf1.getHeight() * COM_NUM_CHANNELS_COLOR * sizeof(float));
for (n = 1; n < settings->iter && (!breaked); n++) {
- for (y = 0; y < gbuf->getHeight() && (!breaked); y++) {
- v = ((float)y + 0.5f) / (float)gbuf->getHeight();
- for (x = 0; x < gbuf->getWidth(); x++) {
- u = ((float)x + 0.5f) / (float)gbuf->getWidth();
+ for (y = 0; y < gbuf.getHeight() && (!breaked); y++) {
+ v = ((float)y + 0.5f) / (float)gbuf.getHeight();
+ for (x = 0; x < gbuf.getWidth(); x++) {
+ u = ((float)x + 0.5f) / (float)gbuf.getWidth();
tc[0] = tc[1] = tc[2] = 0.0f;
for (p = 0; p < 4; p++) {
np = (n << 2) + p;
s = (u - 0.5f) * scalef[np] + 0.5f;
t = (v - 0.5f) * scalef[np] + 0.5f;
- gbuf->readBilinear(c, s * gbuf->getWidth() - 0.5f, t * gbuf->getHeight() - 0.5f);
+ gbuf.readBilinear(c, s * gbuf.getWidth() - 0.5f, t * gbuf.getHeight() - 0.5f);
mul_v3_v3(c, cm[np]);
sm = smoothMask(s, t) * 0.25f;
madd_v3_v3fl(tc, c, sm);
}
- tbuf1->addPixel(x, y, tc);
+ tbuf1.addPixel(x, y, tc);
}
if (isBraked()) {
breaked = true;
}
}
- memcpy(gbuf->getBuffer(),
- tbuf1->getBuffer(),
- tbuf1->getWidth() * tbuf1->getHeight() * COM_NUM_CHANNELS_COLOR * sizeof(float));
+ memcpy(gbuf.getBuffer(),
+ tbuf1.getBuffer(),
+ tbuf1.getWidth() * tbuf1.getHeight() * COM_NUM_CHANNELS_COLOR * sizeof(float));
}
memcpy(data,
- gbuf->getBuffer(),
- gbuf->getWidth() * gbuf->getHeight() * COM_NUM_CHANNELS_COLOR * sizeof(float));
-
- delete gbuf;
- delete tbuf1;
- delete tbuf2;
+ gbuf.getBuffer(),
+ gbuf.getWidth() * gbuf.getHeight() * COM_NUM_CHANNELS_COLOR * sizeof(float));
}
diff --git a/source/blender/compositor/operations/COM_GlareSimpleStarOperation.cc b/source/blender/compositor/operations/COM_GlareSimpleStarOperation.cc
index 75c2ae51bde..a2cecb7e171 100644
--- a/source/blender/compositor/operations/COM_GlareSimpleStarOperation.cc
+++ b/source/blender/compositor/operations/COM_GlareSimpleStarOperation.cc
@@ -27,8 +27,8 @@ void GlareSimpleStarOperation::generateGlare(float *data,
const float f1 = 1.0f - settings->fade;
const float f2 = (1.0f - f1) * 0.5f;
- MemoryBuffer *tbuf1 = inputTile->duplicate();
- MemoryBuffer *tbuf2 = inputTile->duplicate();
+ MemoryBuffer tbuf1(*inputTile);
+ MemoryBuffer tbuf2(*inputTile);
bool breaked = false;
for (i = 0; i < settings->iter && (!breaked); i++) {
@@ -40,23 +40,23 @@ void GlareSimpleStarOperation::generateGlare(float *data,
for (x = 0; x < this->getWidth(); x++) {
xm = x - i;
xp = x + i;
- tbuf1->read(c, x, y);
+ tbuf1.read(c, x, y);
mul_v3_fl(c, f1);
- tbuf1->read(tc, (settings->star_45 ? xm : x), ym);
+ tbuf1.read(tc, (settings->star_45 ? xm : x), ym);
madd_v3_v3fl(c, tc, f2);
- tbuf1->read(tc, (settings->star_45 ? xp : x), yp);
+ tbuf1.read(tc, (settings->star_45 ? xp : x), yp);
madd_v3_v3fl(c, tc, f2);
c[3] = 1.0f;
- tbuf1->writePixel(x, y, c);
+ tbuf1.writePixel(x, y, c);
- tbuf2->read(c, x, y);
+ tbuf2.read(c, x, y);
mul_v3_fl(c, f1);
- tbuf2->read(tc, xm, (settings->star_45 ? yp : y));
+ tbuf2.read(tc, xm, (settings->star_45 ? yp : y));
madd_v3_v3fl(c, tc, f2);
- tbuf2->read(tc, xp, (settings->star_45 ? ym : y));
+ tbuf2.read(tc, xp, (settings->star_45 ? ym : y));
madd_v3_v3fl(c, tc, f2);
c[3] = 1.0f;
- tbuf2->writePi
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list