Revision: 48890
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48890
Author: jbakker
Date: 2012-07-13 12:24:42 +0000 (Fri, 13 Jul 2012)
Log Message:
-----------
Removed parameter from executePixel and initializeTileData.
Modified Paths:
--------------
trunk/blender/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.cpp
trunk/blender/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.h
trunk/blender/source/blender/compositor/intern/COM_SocketReader.h
trunk/blender/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h
trunk/blender/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h
trunk/blender/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h
trunk/blender/source/blender/compositor/operations/COM_AntiAliasOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_AntiAliasOperation.h
trunk/blender/source/blender/compositor/operations/COM_BilateralBlurOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_BilateralBlurOperation.h
trunk/blender/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_BlurBaseOperation.h
trunk/blender/source/blender/compositor/operations/COM_BokehBlurOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_BokehBlurOperation.h
trunk/blender/source/blender/compositor/operations/COM_BokehImageOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_BokehImageOperation.h
trunk/blender/source/blender/compositor/operations/COM_BoxMaskOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_BoxMaskOperation.h
trunk/blender/source/blender/compositor/operations/COM_BrightnessOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_BrightnessOperation.h
trunk/blender/source/blender/compositor/operations/COM_CalculateMeanOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_CalculateMeanOperation.h
trunk/blender/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h
trunk/blender/source/blender/compositor/operations/COM_ChangeHSVOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ChangeHSVOperation.h
trunk/blender/source/blender/compositor/operations/COM_ChannelMatteOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ChannelMatteOperation.h
trunk/blender/source/blender/compositor/operations/COM_ChromaMatteOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ChromaMatteOperation.h
trunk/blender/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h
trunk/blender/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.h
trunk/blender/source/blender/compositor/operations/COM_ColorCorrectionOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ColorCorrectionOperation.h
trunk/blender/source/blender/compositor/operations/COM_ColorCurveOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ColorCurveOperation.h
trunk/blender/source/blender/compositor/operations/COM_ColorMatteOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ColorMatteOperation.h
trunk/blender/source/blender/compositor/operations/COM_ColorRampOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ColorRampOperation.h
trunk/blender/source/blender/compositor/operations/COM_ColorSpillOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ColorSpillOperation.h
trunk/blender/source/blender/compositor/operations/COM_CombineChannelsOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_CombineChannelsOperation.h
trunk/blender/source/blender/compositor/operations/COM_CompositorOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertColorProfileOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertColorProfileOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertColorToBWOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertColorToBWOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertColorToValueProg.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertColorToValueProg.h
trunk/blender/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertValueToColorProg.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertValueToColorProg.h
trunk/blender/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvolutionFilterOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvolutionFilterOperation.h
trunk/blender/source/blender/compositor/operations/COM_CropOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_CropOperation.h
trunk/blender/source/blender/compositor/operations/COM_DifferenceMatteOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_DifferenceMatteOperation.h
trunk/blender/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_DilateErodeOperation.h
trunk/blender/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_DirectionalBlurOperation.h
trunk/blender/source/blender/compositor/operations/COM_DisplaceOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_DisplaceOperation.h
trunk/blender/source/blender/compositor/operations/COM_DisplaceSimpleOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_DisplaceSimpleOperation.h
trunk/blender/source/blender/compositor/operations/COM_DistanceMatteOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_DistanceMatteOperation.h
trunk/blender/source/blender/compositor/operations/COM_DotproductOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_DotproductOperation.h
trunk/blender/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h
trunk/blender/source/blender/compositor/operations/COM_EllipseMaskOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_EllipseMaskOperation.h
trunk/blender/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h
trunk/blender/source/blender/compositor/operations/COM_FlipOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_FlipOperation.h
trunk/blender/source/blender/compositor/operations/COM_GammaCorrectOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_GammaCorrectOperation.h
trunk/blender/source/blender/compositor/operations/COM_GammaOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_GammaOperation.h
trunk/blender/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.h
trunk/blender/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.h
trunk/blender/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h
trunk/blender/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_GaussianXBlurOperation.h
trunk/blender/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_GaussianYBlurOperation.h
trunk/blender/source/blender/compositor/operations/COM_GlareBaseOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_GlareBaseOperation.h
trunk/blender/source/blender/compositor/operations/COM_GlareThresholdOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_GlareThresholdOperation.h
trunk/blender/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h
trunk/blender/source/blender/compositor/operations/COM_IDMaskOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_IDMaskOperation.h
trunk/blender/source/blender/compositor/operations/COM_ImageOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ImageOperation.h
trunk/blender/source/blender/compositor/operations/COM_InvertOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_InvertOperation.h
trunk/blender/source/blender/compositor/operations/COM_KeyingBlurOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_KeyingBlurOperation.h
trunk/blender/source/blender/compositor/operations/COM_KeyingClipOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_KeyingClipOperation.h
trunk/blender/source/blender/compositor/operations/COM_KeyingDespillOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_KeyingDespillOperation.h
trunk/blender/source/blender/compositor/operations/COM_KeyingOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_KeyingOperation.h
trunk/blender/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_KeyingScreenOperation.h
trunk/blender/source/blender/compositor/operations/COM_LuminanceMatteOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_LuminanceMatteOperation.h
trunk/blender/source/blender/compositor/operations/COM_MapUVOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MapUVOperation.h
trunk/blender/source/blender/compositor/operations/COM_MapValueOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MapValueOperation.h
trunk/blender/source/blender/compositor/operations/COM_MaskOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MaskOperation.h
trunk/blender/source/blender/compositor/operations/COM_MathBaseOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MathBaseOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixAddOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixAddOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixBaseOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixBaseOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixBlendOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixBlendOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixBurnOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixBurnOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixColorOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixColorOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixDarkenOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixDarkenOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixDifferenceOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixDifferenceOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixDivideOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixDivideOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixDodgeOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixDodgeOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixGlareOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixGlareOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixHueOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixHueOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixLightenOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixLightenOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixLinearLightOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixLinearLightOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixMultiplyOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixMultiplyOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixOverlayOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixOverlayOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixSaturationOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixSaturationOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixScreenOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixScreenOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixSoftLightOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixSoftLightOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixSubtractOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixSubtractOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixValueOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixValueOperation.h
trunk/blender/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MovieClipAttributeOperation.h
trunk/blender/source/blender/compositor/operations/COM_MovieClipOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MovieClipOperation.h
trunk/blender/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MovieDistortionOperation.h
trunk/blender/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MultilayerImageOperation.h
trunk/blender/source/blender/compositor/operations/COM_NormalizeOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_NormalizeOperation.h
trunk/blender/source/blender/compositor/operations/COM_OutputFileOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_PreviewOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.h
trunk/blender/source/blender/compositor/operations/COM_ReadBufferOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ReadBufferOperation.h
trunk/blender/source/blender/compositor/operations/COM_RenderLayersAlphaProg.cpp
trunk/blender/source/blender/compositor/operations/COM_RenderLayersAlphaProg.h
trunk/blender/source/blender/compositor/operations/COM_RenderLayersBaseProg.cpp
trunk/blender/source/blender/compositor/operations/COM_RenderLayersBaseProg.h
trunk/blender/source/blender/compositor/operations/COM_RotateOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_RotateOperation.h
trunk/blender/source/blender/compositor/operations/COM_ScaleOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ScaleOperation.h
trunk/blender/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.h
trunk/blender/source/blender/compositor/operations/COM_SeparateChannelOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_SeparateChannelOperation.h
trunk/blender/source/blender/compositor/operations/COM_SetAlphaOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_SetAlphaOperation.h
trunk/blender/source/blender/compositor/operations/COM_SetColorOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_SetColorOperation.h
trunk/blender/source/blender/compositor/operations/COM_SetSamplerOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_SetSamplerOperation.h
trunk/blender/source/blender/compositor/operations/COM_SetValueOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_SetValueOperation.h
trunk/blender/source/blender/compositor/operations/COM_SetVectorOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_SetVectorOperation.h
trunk/blender/source/blender/compositor/operations/COM_SocketProxyOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_SocketProxyOperation.h
trunk/blender/source/blender/compositor/operations/COM_SplitViewerOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_TextureOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_TextureOperation.h
trunk/blender/source/blender/compositor/operations/COM_TonemapOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_TonemapOperation.h
trunk/blender/source/blender/compositor/operations/COM_TranslateOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_TranslateOperation.h
trunk/blender/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h
trunk/blender/source/blender/compositor/operations/COM_VectorBlurOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_VectorBlurOperation.h
trunk/blender/source/blender/compositor/operations/COM_VectorCurveOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_VectorCurveOperation.h
trunk/blender/source/blender/compositor/operations/COM_ViewerOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_WriteBufferOperation.h
trunk/blender/source/blender/compositor/operations/COM_ZCombineOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ZCombineOperation.h
Modified:
trunk/blender/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.cpp
===================================================================
---
trunk/blender/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.cpp
2012-07-13 12:06:31 UTC (rev 48889)
+++
trunk/blender/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.cpp
2012-07-13 12:24:42 UTC (rev 48890)
@@ -33,7 +33,7 @@
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 @@
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;
Modified:
trunk/blender/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.h
===================================================================
---
trunk/blender/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.h
2012-07-13 12:06:31 UTC (rev 48889)
+++
trunk/blender/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.h
2012-07-13 12:24:42 UTC (rev 48890)
@@ -39,7 +39,7 @@
/**
* 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 @@
*/
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; }
};
Modified: trunk/blender/source/blender/compositor/intern/COM_SocketReader.h
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_SocketReader.h
2012-07-13 12:06:31 UTC (rev 48889)
+++ trunk/blender/source/blender/compositor/intern/COM_SocketReader.h
2012-07-13 12:24:42 UTC (rev 48890)
@@ -63,7 +63,7 @@
* @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 @@
* @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 @@
* @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; }
Modified:
trunk/blender/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp
===================================================================
---
trunk/blender/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp
2012-07-13 12:06:31 UTC (rev 48889)
+++
trunk/blender/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp
2012-07-13 12:24:42 UTC (rev 48890)
@@ -27,15 +27,15 @@
/* pass */
}
-void AlphaOverKeyOperation::executePixel(float *outputValue, float x, float y,
PixelSampler sampler, MemoryBuffer *inputBuffers[])
+void AlphaOverKeyOperation::executePixel(float *outputValue, float x, float y,
PixelSampler sampler)
{
float inputColor1[4];
float inputOverColor[4];
float value[4];
- this->m_inputValueOperation->read(value, x, y, sampler, inputBuffers);
- this->m_inputColor1Operation->read(inputColor1, x, y, sampler,
inputBuffers);
- this->m_inputColor2Operation->read(inputOverColor, x, y, sampler,
inputBuffers);
+ this->m_inputValueOperation->read(value, x, y, sampler);
+ this->m_inputColor1Operation->read(inputColor1, x, y, sampler);
+ this->m_inputColor2Operation->read(inputOverColor, x, y, sampler);
if (inputOverColor[3] <= 0.0f) {
copy_v4_v4(outputValue, inputColor1);
Modified:
trunk/blender/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h
===================================================================
---
trunk/blender/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h
2012-07-13 12:06:31 UTC (rev 48889)
+++
trunk/blender/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h
2012-07-13 12:24:42 UTC (rev 48890)
@@ -39,6 +39,6 @@
/**
* the inner loop of this program
*/
- void executePixel(float *color, float x, float y, PixelSampler sampler,
MemoryBuffer * inputBuffers[]);
+ void executePixel(float *color, float x, float y, PixelSampler sampler);
};
#endif
Modified:
trunk/blender/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp
===================================================================
---
trunk/blender/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp
2012-07-13 12:06:31 UTC (rev 48889)
+++
trunk/blender/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp
2012-07-13 12:24:42 UTC (rev 48890)
@@ -27,15 +27,15 @@
this->m_x = 0.0f;
}
-void AlphaOverMixedOperation::executePixel(float outputValue[4], float x,
float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
+void AlphaOverMixedOperation::executePixel(float outputValue[4], float x,
float y, PixelSampler sampler)
{
float inputColor1[4];
float inputOverColor[4];
float value[4];
- this->m_inputValueOperation->read(value, x, y, sampler, inputBuffers);
- this->m_inputColor1Operation->read(inputColor1, x, y, sampler,
inputBuffers);
- this->m_inputColor2Operation->read(inputOverColor, x, y, sampler,
inputBuffers);
+ this->m_inputValueOperation->read(value, x, y, sampler);
+ this->m_inputColor1Operation->read(inputColor1, x, y, sampler);
+ this->m_inputColor2Operation->read(inputOverColor, x, y, sampler);
if (inputOverColor[3] <= 0.0f) {
copy_v4_v4(outputValue, inputColor1);
Modified:
trunk/blender/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h
===================================================================
---
trunk/blender/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h
2012-07-13 12:06:31 UTC (rev 48889)
+++
trunk/blender/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h
2012-07-13 12:24:42 UTC (rev 48890)
@@ -41,7 +41,7 @@
/**
* the inner loop of this program
*/
- void executePixel(float *color, float x, float y, PixelSampler sampler,
MemoryBuffer * inputBuffers[]);
+ void executePixel(float *color, float x, float y, PixelSampler sampler);
void setX(float x) { this->m_x = x; }
};
Modified:
trunk/blender/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cpp
===================================================================
---
trunk/blender/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cpp
2012-07-13 12:06:31 UTC (rev 48889)
+++
trunk/blender/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cpp
2012-07-13 12:24:42 UTC (rev 48890)
@@ -27,15 +27,15 @@
/* pass */
}
-void AlphaOverPremultiplyOperation::executePixel(float *outputValue, float x,
float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
+void AlphaOverPremultiplyOperation::executePixel(float *outputValue, float x,
float y, PixelSampler sampler)
{
float inputColor1[4];
float inputOverColor[4];
float value[4];
- this->m_inputValueOperation->read(value, x, y, sampler, inputBuffers);
- this->m_inputColor1Operation->read(inputColor1, x, y, sampler,
inputBuffers);
- this->m_inputColor2Operation->read(inputOverColor, x, y, sampler,
inputBuffers);
+ this->m_inputValueOperation->read(value, x, y, sampler);
+ this->m_inputColor1Operation->read(inputColor1, x, y, sampler);
+ this->m_inputColor2Operation->read(inputOverColor, x, y, sampler);
/* Zero alpha values should still permit an add of RGB data */
if (inputOverColor[3] < 0.0f) {
Modified:
trunk/blender/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h
===================================================================
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
