Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManuel Castilla <manzanillawork@gmail.com>2021-10-14 00:01:15 +0300
committerManuel Castilla <manzanillawork@gmail.com>2021-10-14 00:41:14 +0300
commit1c42d4930a24d639b3aa561b9a8b4bbce05977e0 (patch)
tree68c2aae3fd5ae98b78708bea28c0b55d3f4fb5f0 /source/blender/compositor/operations/COM_GaussianYBlurOperation.cc
parenta2ee3c3a9f01f5cb2f05f1e84a1b6c1931d9d4a4 (diff)
Cleanup: convert camelCase naming to snake_case in Compositor
To convert old code to the current convention and use a single code style.
Diffstat (limited to 'source/blender/compositor/operations/COM_GaussianYBlurOperation.cc')
-rw-r--r--source/blender/compositor/operations/COM_GaussianYBlurOperation.cc127
1 files changed, 65 insertions, 62 deletions
diff --git a/source/blender/compositor/operations/COM_GaussianYBlurOperation.cc b/source/blender/compositor/operations/COM_GaussianYBlurOperation.cc
index 50edc0bea29..639536ebcc1 100644
--- a/source/blender/compositor/operations/COM_GaussianYBlurOperation.cc
+++ b/source/blender/compositor/operations/COM_GaussianYBlurOperation.cc
@@ -25,22 +25,22 @@ GaussianYBlurOperation::GaussianYBlurOperation() : GaussianBlurBaseOperation(eDi
{
}
-void *GaussianYBlurOperation::initializeTileData(rcti * /*rect*/)
+void *GaussianYBlurOperation::initialize_tile_data(rcti * /*rect*/)
{
- lockMutex();
+ lock_mutex();
if (!sizeavailable_) {
- updateGauss();
+ update_gauss();
}
- void *buffer = getInputOperation(0)->initializeTileData(nullptr);
- unlockMutex();
+ void *buffer = get_input_operation(0)->initialize_tile_data(nullptr);
+ unlock_mutex();
return buffer;
}
-void GaussianYBlurOperation::initExecution()
+void GaussianYBlurOperation::init_execution()
{
- GaussianBlurBaseOperation::initExecution();
+ GaussianBlurBaseOperation::init_execution();
- initMutex();
+ init_mutex();
if (sizeavailable_ && execution_model_ == eExecutionModel::Tiled) {
float rad = max_ff(size_ * data_.sizey, 0.0f);
@@ -53,10 +53,10 @@ void GaussianYBlurOperation::initExecution()
}
}
-void GaussianYBlurOperation::updateGauss()
+void GaussianYBlurOperation::update_gauss()
{
if (gausstab_ == nullptr) {
- updateSize();
+ update_size();
float rad = max_ff(size_ * data_.sizey, 0.0f);
rad = min_ff(rad, MAX_GAUSSTAB_RADIUS);
filtersize_ = min_ii(ceil(rad), MAX_GAUSSTAB_RADIUS);
@@ -68,14 +68,14 @@ void GaussianYBlurOperation::updateGauss()
}
}
-void GaussianYBlurOperation::executePixel(float output[4], int x, int y, void *data)
+void GaussianYBlurOperation::execute_pixel(float output[4], int x, int y, void *data)
{
float ATTR_ALIGN(16) color_accum[4] = {0.0f, 0.0f, 0.0f, 0.0f};
float multiplier_accum = 0.0f;
- MemoryBuffer *inputBuffer = (MemoryBuffer *)data;
- const rcti &input_rect = inputBuffer->get_rect();
- float *buffer = inputBuffer->getBuffer();
- int bufferwidth = inputBuffer->getWidth();
+ MemoryBuffer *input_buffer = (MemoryBuffer *)data;
+ const rcti &input_rect = input_buffer->get_rect();
+ float *buffer = input_buffer->get_buffer();
+ int bufferwidth = input_buffer->get_width();
int bufferstartx = input_rect.xmin;
int bufferstarty = input_rect.ymin;
@@ -84,14 +84,14 @@ void GaussianYBlurOperation::executePixel(float output[4], int x, int y, void *d
int ymax = min_ii(y + filtersize_ + 1, input_rect.ymax);
int index;
- int step = getStep();
- const int bufferIndexx = ((xmin - bufferstartx) * 4);
+ int step = get_step();
+ const int buffer_indexx = ((xmin - bufferstartx) * 4);
#ifdef BLI_HAVE_SSE2
__m128 accum_r = _mm_load_ps(color_accum);
for (int ny = ymin; ny < ymax; ny += step) {
index = (ny - y) + filtersize_;
- int bufferindex = bufferIndexx + ((ny - bufferstarty) * 4 * bufferwidth);
+ int bufferindex = buffer_indexx + ((ny - bufferstarty) * 4 * bufferwidth);
const float multiplier = gausstab_[index];
__m128 reg_a = _mm_load_ps(&buffer[bufferindex]);
reg_a = _mm_mul_ps(reg_a, gausstab_sse_[index]);
@@ -102,7 +102,7 @@ void GaussianYBlurOperation::executePixel(float output[4], int x, int y, void *d
#else
for (int ny = ymin; ny < ymax; ny += step) {
index = (ny - y) + filtersize_;
- int bufferindex = bufferIndexx + ((ny - bufferstarty) * 4 * bufferwidth);
+ int bufferindex = buffer_indexx + ((ny - bufferstarty) * 4 * bufferwidth);
const float multiplier = gausstab_[index];
madd_v4_v4fl(color_accum, &buffer[bufferindex], multiplier);
multiplier_accum += multiplier;
@@ -111,41 +111,45 @@ void GaussianYBlurOperation::executePixel(float output[4], int x, int y, void *d
mul_v4_v4fl(output, color_accum, 1.0f / multiplier_accum);
}
-void GaussianYBlurOperation::executeOpenCL(OpenCLDevice *device,
- MemoryBuffer *outputMemoryBuffer,
- cl_mem clOutputBuffer,
- MemoryBuffer **inputMemoryBuffers,
- std::list<cl_mem> *clMemToCleanUp,
- std::list<cl_kernel> * /*clKernelsToCleanUp*/)
+void GaussianYBlurOperation::execute_opencl(OpenCLDevice *device,
+ MemoryBuffer *output_memory_buffer,
+ cl_mem cl_output_buffer,
+ MemoryBuffer **input_memory_buffers,
+ std::list<cl_mem> *cl_mem_to_clean_up,
+ std::list<cl_kernel> * /*cl_kernels_to_clean_up*/)
{
- cl_kernel gaussianYBlurOperationKernel = device->COM_clCreateKernel(
- "gaussianYBlurOperationKernel", nullptr);
+ cl_kernel gaussian_yblur_operation_kernel = device->COM_cl_create_kernel(
+ "gaussian_yblur_operation_kernel", nullptr);
cl_int filter_size = filtersize_;
- cl_mem gausstab = clCreateBuffer(device->getContext(),
+ cl_mem gausstab = clCreateBuffer(device->get_context(),
CL_MEM_READ_ONLY | CL_MEM_USE_HOST_PTR,
sizeof(float) * (filtersize_ * 2 + 1),
gausstab_,
nullptr);
- device->COM_clAttachMemoryBufferToKernelParameter(
- gaussianYBlurOperationKernel, 0, 1, clMemToCleanUp, inputMemoryBuffers, inputProgram_);
- device->COM_clAttachOutputMemoryBufferToKernelParameter(
- gaussianYBlurOperationKernel, 2, clOutputBuffer);
- device->COM_clAttachMemoryBufferOffsetToKernelParameter(
- gaussianYBlurOperationKernel, 3, outputMemoryBuffer);
- clSetKernelArg(gaussianYBlurOperationKernel, 4, sizeof(cl_int), &filter_size);
- device->COM_clAttachSizeToKernelParameter(gaussianYBlurOperationKernel, 5, this);
- clSetKernelArg(gaussianYBlurOperationKernel, 6, sizeof(cl_mem), &gausstab);
-
- device->COM_clEnqueueRange(gaussianYBlurOperationKernel, outputMemoryBuffer, 7, this);
+ device->COM_cl_attach_memory_buffer_to_kernel_parameter(gaussian_yblur_operation_kernel,
+ 0,
+ 1,
+ cl_mem_to_clean_up,
+ input_memory_buffers,
+ input_program_);
+ device->COM_cl_attach_output_memory_buffer_to_kernel_parameter(
+ gaussian_yblur_operation_kernel, 2, cl_output_buffer);
+ device->COM_cl_attach_memory_buffer_offset_to_kernel_parameter(
+ gaussian_yblur_operation_kernel, 3, output_memory_buffer);
+ clSetKernelArg(gaussian_yblur_operation_kernel, 4, sizeof(cl_int), &filter_size);
+ device->COM_cl_attach_size_to_kernel_parameter(gaussian_yblur_operation_kernel, 5, this);
+ clSetKernelArg(gaussian_yblur_operation_kernel, 6, sizeof(cl_mem), &gausstab);
+
+ device->COM_cl_enqueue_range(gaussian_yblur_operation_kernel, output_memory_buffer, 7, this);
clReleaseMemObject(gausstab);
}
-void GaussianYBlurOperation::deinitExecution()
+void GaussianYBlurOperation::deinit_execution()
{
- GaussianBlurBaseOperation::deinitExecution();
+ GaussianBlurBaseOperation::deinit_execution();
if (gausstab_) {
MEM_freeN(gausstab_);
@@ -158,40 +162,39 @@ void GaussianYBlurOperation::deinitExecution()
}
#endif
- deinitMutex();
+ deinit_mutex();
}
-bool GaussianYBlurOperation::determineDependingAreaOfInterest(rcti *input,
- ReadBufferOperation *readOperation,
- rcti *output)
+bool GaussianYBlurOperation::determine_depending_area_of_interest(
+ rcti *input, ReadBufferOperation *read_operation, rcti *output)
{
- rcti newInput;
+ rcti new_input;
if (!sizeavailable_) {
- rcti sizeInput;
- sizeInput.xmin = 0;
- sizeInput.ymin = 0;
- sizeInput.xmax = 5;
- sizeInput.ymax = 5;
- NodeOperation *operation = this->getInputOperation(1);
- if (operation->determineDependingAreaOfInterest(&sizeInput, readOperation, output)) {
+ rcti size_input;
+ size_input.xmin = 0;
+ size_input.ymin = 0;
+ size_input.xmax = 5;
+ size_input.ymax = 5;
+ NodeOperation *operation = this->get_input_operation(1);
+ if (operation->determine_depending_area_of_interest(&size_input, read_operation, output)) {
return true;
}
}
{
if (sizeavailable_ && gausstab_ != nullptr) {
- newInput.xmax = input->xmax;
- newInput.xmin = input->xmin;
- newInput.ymax = input->ymax + filtersize_ + 1;
- newInput.ymin = input->ymin - filtersize_ - 1;
+ new_input.xmax = input->xmax;
+ new_input.xmin = input->xmin;
+ new_input.ymax = input->ymax + filtersize_ + 1;
+ new_input.ymin = input->ymin - filtersize_ - 1;
}
else {
- newInput.xmax = this->getWidth();
- newInput.xmin = 0;
- newInput.ymax = this->getHeight();
- newInput.ymin = 0;
+ new_input.xmax = this->get_width();
+ new_input.xmin = 0;
+ new_input.ymax = this->get_height();
+ new_input.ymin = 0;
}
- return NodeOperation::determineDependingAreaOfInterest(&newInput, readOperation, output);
+ return NodeOperation::determine_depending_area_of_interest(&new_input, read_operation, output);
}
}