diff options
author | Jeroen Bakker <j.bakker@atmind.nl> | 2012-07-13 16:24:42 +0400 |
---|---|---|
committer | Jeroen Bakker <j.bakker@atmind.nl> | 2012-07-13 16:24:42 +0400 |
commit | 9987a8fca727d117b1d94587144d704be0b235dd (patch) | |
tree | d3f9a7c0b03262e67fd6496fec5d828ba3d51251 /source/blender/compositor/intern | |
parent | bccd5380f56c0cac18a5734e386efeee7b7e6d0f (diff) |
Removed parameter from executePixel and initializeTileData.
Diffstat (limited to 'source/blender/compositor/intern')
3 files changed, 18 insertions, 18 deletions
diff --git a/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.cpp b/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.cpp index 0496974c64f..d14b8c48c89 100644 --- a/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.cpp +++ b/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.cpp @@ -33,7 +33,7 @@ void SingleThreadedNodeOperation::initExecution() initMutex(); } -void SingleThreadedNodeOperation::executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data) +void SingleThreadedNodeOperation::executePixel(float *color, int x, int y, void *data) { this->m_cachedInstance->readNoCheck(color, x, y); } @@ -46,14 +46,14 @@ void SingleThreadedNodeOperation::deinitExecution() this->m_cachedInstance = NULL; } } -void *SingleThreadedNodeOperation::initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers) +void *SingleThreadedNodeOperation::initializeTileData(rcti *rect) { if (this->m_cachedInstance) return this->m_cachedInstance; lockMutex(); if (this->m_cachedInstance == NULL) { // - this->m_cachedInstance = createMemoryBuffer(rect, memoryBuffers); + this->m_cachedInstance = createMemoryBuffer(rect); } unlockMutex(); return this->m_cachedInstance; diff --git a/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.h b/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.h index c6db5381f48..68951eab507 100644 --- a/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.h +++ b/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.h @@ -39,7 +39,7 @@ public: /** * the inner loop of this program */ - void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data); + void executePixel(float *color, int x, int y, void *data); /** * Initialize the execution @@ -51,9 +51,9 @@ public: */ void deinitExecution(); - void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers); + void *initializeTileData(rcti *rect); - virtual MemoryBuffer *createMemoryBuffer(rcti *rect, MemoryBuffer **memoryBuffers) = 0; + virtual MemoryBuffer *createMemoryBuffer(rcti *rect) = 0; int isSingleThreaded() { return true; } }; diff --git a/source/blender/compositor/intern/COM_SocketReader.h b/source/blender/compositor/intern/COM_SocketReader.h index 0f35fcfb0df..736dd2fc8b6 100644 --- a/source/blender/compositor/intern/COM_SocketReader.h +++ b/source/blender/compositor/intern/COM_SocketReader.h @@ -63,7 +63,7 @@ protected: * @param y the y-coordinate of the pixel to calculate in image space * @param inputBuffers chunks that can be read by their ReadBufferOperation. */ - virtual void executePixel(float *result, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]) {} + virtual void executePixel(float *result, float x, float y, PixelSampler sampler) {} /** * @brief calculate a single pixel @@ -74,8 +74,8 @@ protected: * @param inputBuffers chunks that can be read by their ReadBufferOperation. * @param chunkData chunk specific data a during execution time. */ - virtual void executePixel(float *result, int x, int y, MemoryBuffer *inputBuffers[], void *chunkData) { - executePixel(result, x, y, COM_PS_NEAREST, inputBuffers); + virtual void executePixel(float *result, int x, int y, void *chunkData) { + executePixel(result, x, y, COM_PS_NEAREST); } /** @@ -88,21 +88,21 @@ protected: * @param dy * @param inputBuffers chunks that can be read by their ReadBufferOperation. */ - virtual void executePixel(float *result, float x, float y, float dx, float dy, MemoryBuffer *inputBuffers[]) {} + virtual void executePixel(float *result, float x, float y, float dx, float dy) {} public: - inline void read(float *result, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]) { - executePixel(result, x, y, sampler, inputBuffers); + inline void read(float *result, float x, float y, PixelSampler sampler) { + executePixel(result, x, y, sampler); } - inline void read(float *result, int x, int y, MemoryBuffer *inputBuffers[], void *chunkData) { - executePixel(result, x, y, inputBuffers, chunkData); + inline void read(float *result, int x, int y, void *chunkData) { + executePixel(result, x, y, chunkData); } - inline void read(float *result, float x, float y, float dx, float dy, MemoryBuffer *inputBuffers[]) { - executePixel(result, x, y, dx, dy, inputBuffers); + inline void read(float *result, float x, float y, float dx, float dy) { + executePixel(result, x, y, dx, dy); } - virtual void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers) { return 0; } - virtual void deinitializeTileData(rcti *rect, MemoryBuffer **memoryBuffers, void *data) { + virtual void *initializeTileData(rcti *rect) { return 0; } + virtual void deinitializeTileData(rcti *rect, void *data) { } virtual MemoryBuffer *getInputMemoryBuffer(MemoryBuffer **memoryBuffers) { return 0; } |