liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed formatting in rtengine/helpersse2.h and rtengine/opthelper.h

Browse Source
This commit is contained in:
Morgan Hardwood 2015-08-18 13:50:06 +02:00
parent 07c3cc6209
commit 73744fe131
2 changed files with 62 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
rtengine/helpersse2.h
View File

@ -22,19 +22,19 @@ typedef __m128i vint2;
// //
#ifdef __GNUC__ #ifdef __GNUC__
#if (__GNUC__ == 4 && __GNUC_MINOR__ >= 9) || __GNUC__ > 4 #if (__GNUC__ == 4 && __GNUC_MINOR__ >= 9) || __GNUC__ > 4
#define LVF(x) _mm_load_ps(&x) #define LVF(x) _mm_load_ps(&x)
#define LVFU(x) _mm_loadu_ps(&x) #define LVFU(x) _mm_loadu_ps(&x)
#define STVF(x,y) _mm_store_ps(&x,y) #define STVF(x,y) _mm_store_ps(&x,y)
#else // there is a bug in gcc 4.7.x when using openmp and aligned memory and -O3 #else // there is a bug in gcc 4.7.x when using openmp and aligned memory and -O3
#define LVF(x) _mm_loadu_ps(&x) #define LVF(x) _mm_loadu_ps(&x)
#define LVFU(x) _mm_loadu_ps(&x) #define LVFU(x) _mm_loadu_ps(&x)
#define STVF(x,y) _mm_storeu_ps(&x,y) #define STVF(x,y) _mm_storeu_ps(&x,y)
#endif #endif
#else #else
#define LVF(x) _mm_load_ps(&x) #define LVF(x) _mm_load_ps(&x)
#define LVFU(x) _mm_loadu_ps(&x) #define LVFU(x) _mm_loadu_ps(&x)
#define STVF(x,y) _mm_store_ps(&x,y) #define STVF(x,y) _mm_store_ps(&x,y)
#endif #endif
// Load 8 floats from a and combine a[0],a[2],a[4] and a[6] into a vector of 4 floats // Load 8 floats from a and combine a[0],a[2],a[4] and a[6] into a vector of 4 floats

100
rtengine/opthelper.h
View File

@ -20,56 +20,56 @@
//////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////
#ifndef OPTHELPER_H #ifndef OPTHELPER_H
#define OPTHELPER_H #define OPTHELPER_H
#ifdef __SSE2__ #ifdef __SSE2__
#include "sleefsseavx.c" #include "sleefsseavx.c"
#ifdef __GNUC__ #ifdef __GNUC__
#if defined(WIN32) && !defined( __x86_64__ ) #if defined(WIN32) && !defined( __x86_64__ )
// needed for actual versions of GCC with 32-Bit Windows // needed for actual versions of GCC with 32-Bit Windows
#define SSEFUNCTION __attribute__((force_align_arg_pointer)) #define SSEFUNCTION __attribute__((force_align_arg_pointer))
#else #else
#define SSEFUNCTION #define SSEFUNCTION
#endif #endif
#else #else
#define SSEFUNCTION #define SSEFUNCTION
#endif #endif
#else #else
#ifdef __SSE__ #ifdef __SSE__
#ifdef __GNUC__ #ifdef __GNUC__
#if defined(WIN32) && !defined( __x86_64__ ) #if defined(WIN32) && !defined( __x86_64__ )
// needed for actual versions of GCC with 32-Bit Windows // needed for actual versions of GCC with 32-Bit Windows
#define SSEFUNCTION __attribute__((force_align_arg_pointer)) #define SSEFUNCTION __attribute__((force_align_arg_pointer))
#else #else
#define SSEFUNCTION #define SSEFUNCTION
#endif #endif
#else #else
#define SSEFUNCTION #define SSEFUNCTION
#endif #endif
#else #else
#define SSEFUNCTION #define SSEFUNCTION
#endif #endif
#endif #endif
#ifdef __GNUC__ #ifdef __GNUC__
#define RESTRICT __restrict__ #define RESTRICT __restrict__
#define LIKELY(x) __builtin_expect (!!(x), 1) #define LIKELY(x) __builtin_expect (!!(x), 1)
#define UNLIKELY(x) __builtin_expect (!!(x), 0) #define UNLIKELY(x) __builtin_expect (!!(x), 0)
#if (__GNUC__ == 4 && __GNUC_MINOR__ >= 9) || __GNUC__ > 4 #if (__GNUC__ == 4 && __GNUC_MINOR__ >= 9) || __GNUC__ > 4
#define ALIGNED64 __attribute__ ((aligned (64))) #define ALIGNED64 __attribute__ ((aligned (64)))
#define ALIGNED16 __attribute__ ((aligned (16))) #define ALIGNED16 __attribute__ ((aligned (16)))
#else // there is a bug in gcc 4.7.x when using openmp and aligned memory and -O3 #else // there is a bug in gcc 4.7.x when using openmp and aligned memory and -O3
#define ALIGNED64 #define ALIGNED64
#define ALIGNED16 #define ALIGNED16
#endif #endif
#else #else
#define RESTRICT #define RESTRICT
#define LIKELY(x) (x) #define LIKELY(x) (x)
#define UNLIKELY(x) (x) #define UNLIKELY(x) (x)
#define ALIGNED64 #define ALIGNED64
#define ALIGNED16 #define ALIGNED16
#endif #endif
#ifndef __clang__ #ifndef __clang__
#define _RT_NESTED_OPENMP _OPENMP #define _RT_NESTED_OPENMP _OPENMP
#endif #endif
#endif #endif