From 854e122e5d07baaef6f221ad7bcc436d8f3c077f Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 3 Aug 2012 10:19:13 +0000 Subject: style cleanup: compositor --- .../blender/compositor/intern/COM_ExecutionGroup.h | 4 ++-- .../compositor/intern/COM_ExecutionSystem.h | 2 +- .../blender/compositor/intern/COM_MemoryBuffer.cpp | 2 +- .../blender/compositor/intern/COM_NodeOperation.h | 4 ++-- .../blender/compositor/intern/COM_OpenCLDevice.cpp | 6 +++--- .../blender/compositor/intern/COM_OpenCLDevice.h | 4 ++-- .../compositor/intern/COM_WorkScheduler.cpp | 24 +++++++++++----------- .../blender/compositor/intern/COM_compositor.cpp | 2 +- 8 files changed, 24 insertions(+), 24 deletions(-) (limited to 'source/blender/compositor/intern') diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.h b/source/blender/compositor/intern/COM_ExecutionGroup.h index e890715cafe..a87b40af89d 100644 --- a/source/blender/compositor/intern/COM_ExecutionGroup.h +++ b/source/blender/compositor/intern/COM_ExecutionGroup.h @@ -316,7 +316,7 @@ public: * @brief get all inputbuffers needed to calculate an chunk * @note all inputbuffers must be executed * @param chunkNumber the chunk to be calculated - * @return MemoryBuffer** the inputbuffers + * @return (MemoryBuffer **) the inputbuffers */ MemoryBuffer **getInputBuffersCPU(); @@ -324,7 +324,7 @@ public: * @brief get all inputbuffers needed to calculate an chunk * @note all inputbuffers must be executed * @param chunkNumber the chunk to be calculated - * @return MemoryBuffer** the inputbuffers + * @return (MemoryBuffer **) the inputbuffers */ MemoryBuffer **getInputBuffersOpenCL(int chunkNumber); diff --git a/source/blender/compositor/intern/COM_ExecutionSystem.h b/source/blender/compositor/intern/COM_ExecutionSystem.h index 4f6780c8d0b..ac849bf4f6c 100644 --- a/source/blender/compositor/intern/COM_ExecutionSystem.h +++ b/source/blender/compositor/intern/COM_ExecutionSystem.h @@ -153,7 +153,7 @@ public: * @brief Create a new ExecutionSystem and initialize it with the * editingtree. * - * @param editingtree [bNodeTree*] + * @param editingtree [bNodeTree *] * @param rendering [true false] */ ExecutionSystem(RenderData *rd, bNodeTree *editingtree, bool rendering, bool fastcalculation); diff --git a/source/blender/compositor/intern/COM_MemoryBuffer.cpp b/source/blender/compositor/intern/COM_MemoryBuffer.cpp index eae98a1211f..3b8fbd6d708 100644 --- a/source/blender/compositor/intern/COM_MemoryBuffer.cpp +++ b/source/blender/compositor/intern/COM_MemoryBuffer.cpp @@ -248,7 +248,7 @@ static void imp2radangle(float A, float B, float C, float F, float *a, float *b, *b = sqrtf(F2 / d); *ecc = *a / *b; } - // incr theta by 0.5*pi (angle of major axis) + /* incr theta by 0.5 * pi (angle of major axis) */ *th = 0.5f * (atan2f(B, AmC) + (float)M_PI); } } diff --git a/source/blender/compositor/intern/COM_NodeOperation.h b/source/blender/compositor/intern/COM_NodeOperation.h index 9b6d574e321..a9cf281b02f 100644 --- a/source/blender/compositor/intern/COM_NodeOperation.h +++ b/source/blender/compositor/intern/COM_NodeOperation.h @@ -148,7 +148,7 @@ public: * @param memoryBuffers all input MemoryBuffer's needed * @param outputBuffer the outputbuffer to write to */ - virtual void executeOpenCLRegion(OpenCLDevice* device, rcti *rect, + virtual void executeOpenCLRegion(OpenCLDevice *device, rcti *rect, unsigned int chunkNumber, MemoryBuffer **memoryBuffers, MemoryBuffer *outputBuffer) {} /** @@ -163,7 +163,7 @@ public: * @param clMemToCleanUp all created cl_mem references must be added to this list. Framework will clean this after execution * @param clKernelsToCleanUp all created cl_kernel references must be added to this list. Framework will clean this after execution */ - virtual void executeOpenCL(OpenCLDevice* device, MemoryBuffer *outputMemoryBuffer, cl_mem clOutputBuffer, MemoryBuffer **inputMemoryBuffers, list *clMemToCleanUp, list *clKernelsToCleanUp) {} + virtual void executeOpenCL(OpenCLDevice *device, MemoryBuffer *outputMemoryBuffer, cl_mem clOutputBuffer, MemoryBuffer **inputMemoryBuffers, list *clMemToCleanUp, list *clKernelsToCleanUp) {} virtual void deinitExecution(); bool isResolutionSet() { diff --git a/source/blender/compositor/intern/COM_OpenCLDevice.cpp b/source/blender/compositor/intern/COM_OpenCLDevice.cpp index 63f75681779..be5936b495e 100644 --- a/source/blender/compositor/intern/COM_OpenCLDevice.cpp +++ b/source/blender/compositor/intern/COM_OpenCLDevice.cpp @@ -67,7 +67,7 @@ void OpenCLDevice::execute(WorkPackage *work) } cl_mem OpenCLDevice::COM_clAttachMemoryBufferToKernelParameter(cl_kernel kernel, int parameterIndex, int offsetIndex, list *cleanup, MemoryBuffer **inputMemoryBuffers, SocketReader *reader) { - return COM_clAttachMemoryBufferToKernelParameter(kernel, parameterIndex, offsetIndex, cleanup, inputMemoryBuffers, (ReadBufferOperation*)reader); + return COM_clAttachMemoryBufferToKernelParameter(kernel, parameterIndex, offsetIndex, cleanup, inputMemoryBuffers, (ReadBufferOperation *)reader); } cl_mem OpenCLDevice::COM_clAttachMemoryBufferToKernelParameter(cl_kernel kernel, int parameterIndex, int offsetIndex, list *cleanup, MemoryBuffer **inputMemoryBuffers, ReadBufferOperation *reader) @@ -106,7 +106,7 @@ void OpenCLDevice::COM_clAttachMemoryBufferOffsetToKernelParameter(cl_kernel ker } } -void OpenCLDevice::COM_clAttachSizeToKernelParameter(cl_kernel kernel, int offsetIndex, NodeOperation* operation) +void OpenCLDevice::COM_clAttachSizeToKernelParameter(cl_kernel kernel, int offsetIndex, NodeOperation *operation) { if (offsetIndex != -1) { cl_int error; @@ -133,7 +133,7 @@ void OpenCLDevice::COM_clEnqueueRange(cl_kernel kernel, MemoryBuffer *outputMemo if (error != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, clewErrorString(error)); } } -void OpenCLDevice::COM_clEnqueueRange(cl_kernel kernel, MemoryBuffer *outputMemoryBuffer, int offsetIndex, NodeOperation* operation) +void OpenCLDevice::COM_clEnqueueRange(cl_kernel kernel, MemoryBuffer *outputMemoryBuffer, int offsetIndex, NodeOperation *operation) { cl_int error; const int width = outputMemoryBuffer->getWidth(); diff --git a/source/blender/compositor/intern/COM_OpenCLDevice.h b/source/blender/compositor/intern/COM_OpenCLDevice.h index f1a1e31c930..2021cacabcc 100644 --- a/source/blender/compositor/intern/COM_OpenCLDevice.h +++ b/source/blender/compositor/intern/COM_OpenCLDevice.h @@ -100,9 +100,9 @@ public: cl_mem COM_clAttachMemoryBufferToKernelParameter(cl_kernel kernel, int parameterIndex, int offsetIndex, list *cleanup, MemoryBuffer **inputMemoryBuffers, ReadBufferOperation *reader); void COM_clAttachMemoryBufferOffsetToKernelParameter(cl_kernel kernel, int offsetIndex, MemoryBuffer *memoryBuffers); void COM_clAttachOutputMemoryBufferToKernelParameter(cl_kernel kernel, int parameterIndex, cl_mem clOutputMemoryBuffer); - void COM_clAttachSizeToKernelParameter(cl_kernel kernel, int offsetIndex, NodeOperation* operation); + void COM_clAttachSizeToKernelParameter(cl_kernel kernel, int offsetIndex, NodeOperation *operation); void COM_clEnqueueRange(cl_kernel kernel, MemoryBuffer *outputMemoryBuffer); - void COM_clEnqueueRange(cl_kernel kernel, MemoryBuffer *outputMemoryBuffer, int offsetIndex, NodeOperation* operation); + void COM_clEnqueueRange(cl_kernel kernel, MemoryBuffer *outputMemoryBuffer, int offsetIndex, NodeOperation *operation); cl_kernel COM_clCreateKernel(const char *kernelname, list *clKernelsToCleanUp); }; diff --git a/source/blender/compositor/intern/COM_WorkScheduler.cpp b/source/blender/compositor/intern/COM_WorkScheduler.cpp index 7d4134aca13..849c4affd9c 100644 --- a/source/blender/compositor/intern/COM_WorkScheduler.cpp +++ b/source/blender/compositor/intern/COM_WorkScheduler.cpp @@ -77,20 +77,20 @@ void ** g_highlightedNodesRead; #define HIGHLIGHT(wp) \ { \ - ExecutionGroup* group = wp->getExecutionGroup(); \ + ExecutionGroup *group = wp->getExecutionGroup(); \ if (group->isComplex()) { \ - NodeOperation* operation = group->getOutputNodeOperation(); \ - if (operation->isWriteBufferOperation()) {\ - WriteBufferOperation *writeOperation = (WriteBufferOperation*)operation;\ + NodeOperation *operation = group->getOutputNodeOperation(); \ + if (operation->isWriteBufferOperation()) { \ + WriteBufferOperation *writeOperation = (WriteBufferOperation *)operation; \ NodeOperation *complexOperation = writeOperation->getInput(); \ bNode *node = complexOperation->getbNode(); \ if (node) { \ if (node->original) { \ - node = node->original;\ - }\ - if (g_highlightIndex < MAX_HIGHLIGHT) {\ - g_highlightedNodes[g_highlightIndex++] = node;\ - }\ + node = node->original; \ + } \ + if (g_highlightIndex < MAX_HIGHLIGHT) { \ + g_highlightedNodes[g_highlightIndex++] = node; \ + } \ } \ } \ } \ @@ -103,18 +103,18 @@ void COM_startReadHighlights() } g_highlightedNodesRead = g_highlightedNodes; - g_highlightedNodes = new void*[MAX_HIGHLIGHT]; + g_highlightedNodes = new void *[MAX_HIGHLIGHT]; g_highlightIndex = 0; for (int i = 0 ; i < MAX_HIGHLIGHT; i++) { g_highlightedNodes[i] = 0; } } -int COM_isHighlightedbNode(bNode* bnode) +int COM_isHighlightedbNode(bNode *bnode) { if (!g_highlightedNodesRead) return false; for (int i = 0 ; i < MAX_HIGHLIGHT; i++) { - void* p = g_highlightedNodesRead[i]; + void *p = g_highlightedNodesRead[i]; if (!p) return false; if (p == bnode) return true; } diff --git a/source/blender/compositor/intern/COM_compositor.cpp b/source/blender/compositor/intern/COM_compositor.cpp index ab64f8f7bf1..2402f9a1163 100644 --- a/source/blender/compositor/intern/COM_compositor.cpp +++ b/source/blender/compositor/intern/COM_compositor.cpp @@ -54,7 +54,7 @@ void COM_execute(RenderData *rd, bNodeTree *editingtree, int rendering) } - /* set progress bar to 0% and status to init compositing*/ + /* set progress bar to 0% and status to init compositing */ editingtree->progress(editingtree->prh, 0.0); bool twopass = (editingtree->flag&NTREE_TWO_PASS) > 0 && !rendering; -- cgit v1.2.3