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

Removed most of the __x86_64__ dependencies. Also removed _RT_NESTED_OPENMP

Browse Source
This commit is contained in:
heckflosse
2018-01-23 16:05:31 +01:00
parent 4046a3c9b9
commit 96bf06a950
28 changed files with 171 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rtengine/shmap.cc
View File

@@ -358,7 +358,7 @@ void SHMap::forceStat (float max_, float min_, float avg_)
avg = avg_;
}
SSEFUNCTION void SHMap::dirpyr_shmap(float ** data_fine, float ** data_coarse, int width, int height, LUTf & rangefn, int level, int scale)
void SHMap::dirpyr_shmap(float ** data_fine, float ** data_coarse, int width, int height, LUTf & rangefn, int level, int scale)
{
//scale is spacing of directional averaging weights
@@ -375,7 +375,7 @@ SSEFUNCTION void SHMap::dirpyr_shmap(float ** data_fine, float ** data_coarse, i
#pragma omp parallel
#endif
{
#if defined( __SSE2__ ) && defined( __x86_64__ )
#ifdef __SSE2__
vfloat dirwtv, valv, normv, dftemp1v, dftemp2v;
#endif // __SSE2__
int j;
@@ -402,7 +402,7 @@ SSEFUNCTION void SHMap::dirpyr_shmap(float ** data_fine, float ** data_coarse, i
data_coarse[i][j] = val / norm; // low pass filter
}
#if defined( __SSE2__ ) && defined( __x86_64__ )
#ifdef __SSE2__
int inbrMin = max(i - scalewin, i % scale);
for(; j < (width - scalewin) - 3; j += 4) {
@@ -482,7 +482,7 @@ SSEFUNCTION void SHMap::dirpyr_shmap(float ** data_fine, float ** data_coarse, i
#pragma omp parallel
#endif
{
#if defined( __SSE2__ ) && defined( __x86_64__ )
#ifdef __SSE2__
vfloat dirwtv, valv, normv, dftemp1v, dftemp2v;
float domkerv[5][5][4] ALIGNED16 = {{{1, 1, 1, 1}, {1, 1, 1, 1}, {1, 1, 1, 1}, {1, 1, 1, 1}, {1, 1, 1, 1}}, {{1, 1, 1, 1}, {2, 2, 2, 2}, {2, 2, 2, 2}, {2, 2, 2, 2}, {1, 1, 1, 1}}, {{1, 1, 1, 1}, {2, 2, 2, 2}, {2, 2, 2, 2}, {2, 2, 2, 2}, {1, 1, 1, 1}}, {{1, 1, 1, 1}, {2, 2, 2, 2}, {2, 2, 2, 2}, {2, 2, 2, 2}, {1, 1, 1, 1}}, {{1, 1, 1, 1}, {1, 1, 1, 1}, {1, 1, 1, 1}, {1, 1, 1, 1}, {1, 1, 1, 1}}};
@@ -510,7 +510,7 @@ SSEFUNCTION void SHMap::dirpyr_shmap(float ** data_fine, float ** data_coarse, i
data_coarse[i][j] = val / norm; // low pass filter
}
#if defined( __SSE2__ ) && defined( __x86_64__ )
#ifdef __SSE2__
for(; j < width - scalewin - 3; j += 4) {
valv = _mm_setzero_ps();