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:
authorCampbell Barton <ideasman42@gmail.com>2019-04-17 07:17:24 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-17 07:21:24 +0300
commite12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch)
tree8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/compositor/operations/COM_WriteBufferOperation.cpp
parentb3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff)
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/compositor/operations/COM_WriteBufferOperation.cpp')
-rw-r--r--source/blender/compositor/operations/COM_WriteBufferOperation.cpp310
1 files changed, 174 insertions, 136 deletions
diff --git a/source/blender/compositor/operations/COM_WriteBufferOperation.cpp b/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
index 30c1d4525ab..beba29e6755 100644
--- a/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
+++ b/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
@@ -23,168 +23,206 @@
WriteBufferOperation::WriteBufferOperation(DataType datatype) : NodeOperation()
{
- this->addInputSocket(datatype);
- this->m_memoryProxy = new MemoryProxy(datatype);
- this->m_memoryProxy->setWriteBufferOperation(this);
- this->m_memoryProxy->setExecutor(NULL);
+ this->addInputSocket(datatype);
+ this->m_memoryProxy = new MemoryProxy(datatype);
+ this->m_memoryProxy->setWriteBufferOperation(this);
+ this->m_memoryProxy->setExecutor(NULL);
}
WriteBufferOperation::~WriteBufferOperation()
{
- if (this->m_memoryProxy) {
- delete this->m_memoryProxy;
- this->m_memoryProxy = NULL;
- }
+ if (this->m_memoryProxy) {
+ delete this->m_memoryProxy;
+ this->m_memoryProxy = NULL;
+ }
}
-void WriteBufferOperation::executePixelSampled(float output[4], float x, float y, PixelSampler sampler)
+void WriteBufferOperation::executePixelSampled(float output[4],
+ float x,
+ float y,
+ PixelSampler sampler)
{
- this->m_input->readSampled(output, x, y, sampler);
+ this->m_input->readSampled(output, x, y, sampler);
}
void WriteBufferOperation::initExecution()
{
- this->m_input = this->getInputOperation(0);
- this->m_memoryProxy->allocate(this->m_width, this->m_height);
+ this->m_input = this->getInputOperation(0);
+ this->m_memoryProxy->allocate(this->m_width, this->m_height);
}
void WriteBufferOperation::deinitExecution()
{
- this->m_input = NULL;
- this->m_memoryProxy->free();
+ this->m_input = NULL;
+ this->m_memoryProxy->free();
}
void WriteBufferOperation::executeRegion(rcti *rect, unsigned int /*tileNumber*/)
{
- MemoryBuffer *memoryBuffer = this->m_memoryProxy->getBuffer();
- float *buffer = memoryBuffer->getBuffer();
- const int num_channels = memoryBuffer->get_num_channels();
- if (this->m_input->isComplex()) {
- void *data = this->m_input->initializeTileData(rect);
- int x1 = rect->xmin;
- int y1 = rect->ymin;
- int x2 = rect->xmax;
- int y2 = rect->ymax;
- int x;
- int y;
- bool breaked = false;
- for (y = y1; y < y2 && (!breaked); y++) {
- int offset4 = (y * memoryBuffer->getWidth() + x1) * num_channels;
- for (x = x1; x < x2; x++) {
- this->m_input->read(&(buffer[offset4]), x, y, data);
- offset4 += num_channels;
- }
- if (isBreaked()) {
- breaked = true;
- }
-
- }
- if (data) {
- this->m_input->deinitializeTileData(rect, data);
- data = NULL;
- }
- }
- else {
- int x1 = rect->xmin;
- int y1 = rect->ymin;
- int x2 = rect->xmax;
- int y2 = rect->ymax;
-
- int x;
- int y;
- bool breaked = false;
- for (y = y1; y < y2 && (!breaked); y++) {
- int offset4 = (y * memoryBuffer->getWidth() + x1) * num_channels;
- for (x = x1; x < x2; x++) {
- this->m_input->readSampled(&(buffer[offset4]), x, y, COM_PS_NEAREST);
- offset4 += num_channels;
- }
- if (isBreaked()) {
- breaked = true;
- }
- }
- }
- memoryBuffer->setCreatedState();
+ MemoryBuffer *memoryBuffer = this->m_memoryProxy->getBuffer();
+ float *buffer = memoryBuffer->getBuffer();
+ const int num_channels = memoryBuffer->get_num_channels();
+ if (this->m_input->isComplex()) {
+ void *data = this->m_input->initializeTileData(rect);
+ int x1 = rect->xmin;
+ int y1 = rect->ymin;
+ int x2 = rect->xmax;
+ int y2 = rect->ymax;
+ int x;
+ int y;
+ bool breaked = false;
+ for (y = y1; y < y2 && (!breaked); y++) {
+ int offset4 = (y * memoryBuffer->getWidth() + x1) * num_channels;
+ for (x = x1; x < x2; x++) {
+ this->m_input->read(&(buffer[offset4]), x, y, data);
+ offset4 += num_channels;
+ }
+ if (isBreaked()) {
+ breaked = true;
+ }
+ }
+ if (data) {
+ this->m_input->deinitializeTileData(rect, data);
+ data = NULL;
+ }
+ }
+ else {
+ int x1 = rect->xmin;
+ int y1 = rect->ymin;
+ int x2 = rect->xmax;
+ int y2 = rect->ymax;
+
+ int x;
+ int y;
+ bool breaked = false;
+ for (y = y1; y < y2 && (!breaked); y++) {
+ int offset4 = (y * memoryBuffer->getWidth() + x1) * num_channels;
+ for (x = x1; x < x2; x++) {
+ this->m_input->readSampled(&(buffer[offset4]), x, y, COM_PS_NEAREST);
+ offset4 += num_channels;
+ }
+ if (isBreaked()) {
+ breaked = true;
+ }
+ }
+ }
+ memoryBuffer->setCreatedState();
}
-void WriteBufferOperation::executeOpenCLRegion(OpenCLDevice *device, rcti * /*rect*/, unsigned int /*chunkNumber*/,
- MemoryBuffer **inputMemoryBuffers, MemoryBuffer *outputBuffer)
+void WriteBufferOperation::executeOpenCLRegion(OpenCLDevice *device,
+ rcti * /*rect*/,
+ unsigned int /*chunkNumber*/,
+ MemoryBuffer **inputMemoryBuffers,
+ MemoryBuffer *outputBuffer)
{
- float *outputFloatBuffer = outputBuffer->getBuffer();
- cl_int error;
- /*
- * 1. create cl_mem from outputbuffer
- * 2. call NodeOperation (input) executeOpenCLChunk(.....)
- * 3. schedule readback from opencl to main device (outputbuffer)
- * 4. schedule native callback
- *
- * note: list of cl_mem will be filled by 2, and needs to be cleaned up by 4
- */
- // STEP 1
- const unsigned int outputBufferWidth = outputBuffer->getWidth();
- const unsigned int outputBufferHeight = outputBuffer->getHeight();
-
- const cl_image_format *imageFormat = device->determineImageFormat(outputBuffer);
-
- cl_mem clOutputBuffer = clCreateImage2D(device->getContext(), CL_MEM_WRITE_ONLY | CL_MEM_USE_HOST_PTR, imageFormat, outputBufferWidth, outputBufferHeight, 0, outputFloatBuffer, &error);
- if (error != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, clewErrorString(error)); }
-
- // STEP 2
- list<cl_mem> *clMemToCleanUp = new list<cl_mem>();
- clMemToCleanUp->push_back(clOutputBuffer);
- list<cl_kernel> *clKernelsToCleanUp = new list<cl_kernel>();
-
- this->m_input->executeOpenCL(device, outputBuffer, clOutputBuffer, inputMemoryBuffers, clMemToCleanUp, clKernelsToCleanUp);
-
- // STEP 3
-
- size_t origin[3] = {0, 0, 0};
- size_t region[3] = {outputBufferWidth, outputBufferHeight, 1};
-
-// clFlush(queue);
-// clFinish(queue);
-
- error = clEnqueueBarrier(device->getQueue());
- if (error != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, clewErrorString(error)); }
- error = clEnqueueReadImage(device->getQueue(), clOutputBuffer, CL_TRUE, origin, region, 0, 0, outputFloatBuffer, 0, NULL, NULL);
- if (error != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, clewErrorString(error)); }
-
- this->getMemoryProxy()->getBuffer()->copyContentFrom(outputBuffer);
-
- // STEP 4
- while (!clMemToCleanUp->empty()) {
- cl_mem mem = clMemToCleanUp->front();
- error = clReleaseMemObject(mem);
- if (error != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, clewErrorString(error)); }
- clMemToCleanUp->pop_front();
- }
-
- while (!clKernelsToCleanUp->empty()) {
- cl_kernel kernel = clKernelsToCleanUp->front();
- error = clReleaseKernel(kernel);
- if (error != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, clewErrorString(error)); }
- clKernelsToCleanUp->pop_front();
- }
- delete clKernelsToCleanUp;
+ float *outputFloatBuffer = outputBuffer->getBuffer();
+ cl_int error;
+ /*
+ * 1. create cl_mem from outputbuffer
+ * 2. call NodeOperation (input) executeOpenCLChunk(.....)
+ * 3. schedule readback from opencl to main device (outputbuffer)
+ * 4. schedule native callback
+ *
+ * note: list of cl_mem will be filled by 2, and needs to be cleaned up by 4
+ */
+ // STEP 1
+ const unsigned int outputBufferWidth = outputBuffer->getWidth();
+ const unsigned int outputBufferHeight = outputBuffer->getHeight();
+
+ const cl_image_format *imageFormat = device->determineImageFormat(outputBuffer);
+
+ cl_mem clOutputBuffer = clCreateImage2D(device->getContext(),
+ CL_MEM_WRITE_ONLY | CL_MEM_USE_HOST_PTR,
+ imageFormat,
+ outputBufferWidth,
+ outputBufferHeight,
+ 0,
+ outputFloatBuffer,
+ &error);
+ if (error != CL_SUCCESS) {
+ printf("CLERROR[%d]: %s\n", error, clewErrorString(error));
+ }
+
+ // STEP 2
+ list<cl_mem> *clMemToCleanUp = new list<cl_mem>();
+ clMemToCleanUp->push_back(clOutputBuffer);
+ list<cl_kernel> *clKernelsToCleanUp = new list<cl_kernel>();
+
+ this->m_input->executeOpenCL(device,
+ outputBuffer,
+ clOutputBuffer,
+ inputMemoryBuffers,
+ clMemToCleanUp,
+ clKernelsToCleanUp);
+
+ // STEP 3
+
+ size_t origin[3] = {0, 0, 0};
+ size_t region[3] = {outputBufferWidth, outputBufferHeight, 1};
+
+ // clFlush(queue);
+ // clFinish(queue);
+
+ error = clEnqueueBarrier(device->getQueue());
+ if (error != CL_SUCCESS) {
+ printf("CLERROR[%d]: %s\n", error, clewErrorString(error));
+ }
+ error = clEnqueueReadImage(device->getQueue(),
+ clOutputBuffer,
+ CL_TRUE,
+ origin,
+ region,
+ 0,
+ 0,
+ outputFloatBuffer,
+ 0,
+ NULL,
+ NULL);
+ if (error != CL_SUCCESS) {
+ printf("CLERROR[%d]: %s\n", error, clewErrorString(error));
+ }
+
+ this->getMemoryProxy()->getBuffer()->copyContentFrom(outputBuffer);
+
+ // STEP 4
+ while (!clMemToCleanUp->empty()) {
+ cl_mem mem = clMemToCleanUp->front();
+ error = clReleaseMemObject(mem);
+ if (error != CL_SUCCESS) {
+ printf("CLERROR[%d]: %s\n", error, clewErrorString(error));
+ }
+ clMemToCleanUp->pop_front();
+ }
+
+ while (!clKernelsToCleanUp->empty()) {
+ cl_kernel kernel = clKernelsToCleanUp->front();
+ error = clReleaseKernel(kernel);
+ if (error != CL_SUCCESS) {
+ printf("CLERROR[%d]: %s\n", error, clewErrorString(error));
+ }
+ clKernelsToCleanUp->pop_front();
+ }
+ delete clKernelsToCleanUp;
}
-void WriteBufferOperation::determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2])
+void WriteBufferOperation::determineResolution(unsigned int resolution[2],
+ unsigned int preferredResolution[2])
{
- NodeOperation::determineResolution(resolution, preferredResolution);
- /* make sure there is at least one pixel stored in case the input is a single value */
- m_single_value = false;
- if (resolution[0] == 0) {
- resolution[0] = 1;
- m_single_value = true;
- }
- if (resolution[1] == 0) {
- resolution[1] = 1;
- m_single_value = true;
- }
+ NodeOperation::determineResolution(resolution, preferredResolution);
+ /* make sure there is at least one pixel stored in case the input is a single value */
+ m_single_value = false;
+ if (resolution[0] == 0) {
+ resolution[0] = 1;
+ m_single_value = true;
+ }
+ if (resolution[1] == 0) {
+ resolution[1] = 1;
+ m_single_value = true;
+ }
}
void WriteBufferOperation::readResolutionFromInputSocket()
{
- NodeOperation *inputOperation = this->getInputOperation(0);
- this->setWidth(inputOperation->getWidth());
- this->setHeight(inputOperation->getHeight());
+ NodeOperation *inputOperation = this->getInputOperation(0);
+ this->setWidth(inputOperation->getWidth());
+ this->setHeight(inputOperation->getHeight());
}