archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: MemoryBuffer do not store width and height.

Browse Source
This commit is contained in:
Jeroen Bakker
2021-03-19 16:45:29 +01:00
parent 8cb1089795
commit 31d5c5078c
3 changed files with 41 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cc
View File

@@ -77,7 +77,7 @@ void *VariableSizeBokehBlurOperation::initializeTileData(rcti *rect)
const float max_dim = MAX2(m_width, m_height);
const float scalar = this->m_do_size_scale ? (max_dim / 100.0f) : 1.0f;
data->maxBlurScalar = (int)(data->size->getMaximumValue(&rect2) * scalar);
data->maxBlurScalar = (int)(data->size->get_max_value(rect2) * scalar);
CLAMP(data->maxBlurScalar, 1.0f, this->m_maxBlur);
return data;
}
@@ -200,7 +200,7 @@ void VariableSizeBokehBlurOperation::executeOpenCL(OpenCLDevice *device,
const float max_dim = MAX2(m_width, m_height);
cl_float scalar = this->m_do_size_scale ? (max_dim / 100.0f) : 1.0f;
maxBlur = (cl_int)min_ff(sizeMemoryBuffer->getMaximumValue() * scalar, (float)this->m_maxBlur);
maxBlur = (cl_int)min_ff(sizeMemoryBuffer->get_max_value() * scalar, (float)this->m_maxBlur);
device->COM_clAttachMemoryBufferToKernelParameter(
defocusKernel, 0, -1, clMemToCleanUp, inputMemoryBuffers, this->m_inputProgram);