From df886b178c9c176eefb73617c997f85e9d750c2d Mon Sep 17 00:00:00 2001 From: Stefan Werner Date: Thu, 9 Nov 2017 14:59:31 +0100 Subject: Moved alignment attributes from my last commit to BLI_compiler_attrs.h for future use. --- .../blender/compositor/operations/COM_GaussianXBlurOperation.cpp | 9 +-------- .../blender/compositor/operations/COM_GaussianYBlurOperation.cpp | 9 +-------- 2 files changed, 2 insertions(+), 16 deletions(-) (limited to 'source/blender/compositor') diff --git a/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp b/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp index c413e94c173..4d05ece7ef0 100644 --- a/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp @@ -85,14 +85,7 @@ void GaussianXBlurOperation::updateGauss() void GaussianXBlurOperation::executePixel(float output[4], int x, int y, void *data) { -#ifdef __SSE2__ -# if defined(_WIN32) && !defined(FREE_WINDOWS) - __declspec(align(16)) -# else - __attribute__((aligned(16))) -# endif -#endif - float color_accum[4] = {0.0f, 0.0f, 0.0f, 0.0f}; + float ATTR_ALIGN(16) color_accum[4] = {0.0f, 0.0f, 0.0f, 0.0f}; float multiplier_accum = 0.0f; MemoryBuffer *inputBuffer = (MemoryBuffer *)data; float *buffer = inputBuffer->getBuffer(); diff --git a/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp b/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp index 5c8c6399981..3203914b5a7 100644 --- a/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp @@ -84,14 +84,7 @@ void GaussianYBlurOperation::updateGauss() void GaussianYBlurOperation::executePixel(float output[4], int x, int y, void *data) { -#ifdef __SSE2__ -# if defined(_WIN32) && !defined(FREE_WINDOWS) - __declspec(align(16)) -# else - __attribute__((aligned(16))) -# endif -#endif - float color_accum[4] = {0.0f, 0.0f, 0.0f, 0.0f}; + float ATTR_ALIGN(16) color_accum[4] = {0.0f, 0.0f, 0.0f, 0.0f}; float multiplier_accum = 0.0f; MemoryBuffer *inputBuffer = (MemoryBuffer *)data; float *buffer = inputBuffer->getBuffer(); -- cgit v1.2.3