Skip to content

Commit 809f8ca

Browse files
MysticialMysticial
committed
Better naming.
1 parent 1cee9bf commit 809f8ca

14 files changed

+84
-57
lines changed

‎SerialPrograms/Source/Kernels/ImageFilters/RGB32_Brightness/Kernels_ImageFilter_RGB32_Brightness_Default.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
*
55
*/
66

7-
#include <immintrin.h>
87
#include "Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines.h"
98
#include "Kernels_ImageFilter_RGB32_Brightness.h"
109

‎SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean.cpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,37 +16,37 @@ size_t filter_rgb32_euclidean_Default(
1616
const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
1717
uint32_t* out, size_t out_bytes_per_row,
1818
uint32_t expected, double max_euclidean_distance,
19-
uint32_t replacement, bool invert
19+
uint32_t replacement, bool replace_color_within_range
2020
);
2121
size_t filter_rgb32_euclidean_x64_SSE42(
2222
const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
2323
uint32_t* out, size_t out_bytes_per_row,
2424
uint32_t expected, double max_euclidean_distance,
25-
uint32_t replacement, bool invert
25+
uint32_t replacement, bool replace_color_within_range
2626
);
2727
size_t filter_rgb32_euclidean_x64_AVX2(
2828
const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
2929
uint32_t* out, size_t out_bytes_per_row,
3030
uint32_t expected, double max_euclidean_distance,
31-
uint32_t replacement, bool invert
31+
uint32_t replacement, bool replace_color_within_range
3232
);
3333
size_t filter_rgb32_euclidean_x64_AVX512(
3434
const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
3535
uint32_t* out, size_t out_bytes_per_row,
3636
uint32_t expected, double max_euclidean_distance,
37-
uint32_t replacement, bool invert
37+
uint32_t replacement, bool replace_color_within_range
3838
);
3939
size_t filter_rgb32_euclidean_arm64_NEON(
4040
const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
4141
uint32_t* out, size_t out_bytes_per_row,
4242
uint32_t expected, double max_euclidean_distance,
43-
uint32_t replacement, bool invert
43+
uint32_t replacement, bool replace_color_within_range
4444
);
4545
size_t filter_rgb32_euclidean(
4646
const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
4747
uint32_t* out, size_t out_bytes_per_row,
4848
uint32_t expected, double max_euclidean_distance,
49-
uint32_t replacement, bool invert
49+
uint32_t replacement, bool replace_color_within_range
5050
){
5151
if (width * height > 0xffffffff){
5252
throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Image is too large. more than 2^32 pixels.");
@@ -57,7 +57,7 @@ size_t filter_rgb32_euclidean(
5757
in, in_bytes_per_row, width, height,
5858
out, out_bytes_per_row,
5959
expected, max_euclidean_distance,
60-
replacement, invert
60+
replacement, replace_color_within_range
6161
);
6262
}
6363
#endif
@@ -67,7 +67,7 @@ size_t filter_rgb32_euclidean(
6767
in, in_bytes_per_row, width, height,
6868
out, out_bytes_per_row,
6969
expected, max_euclidean_distance,
70-
replacement, invert
70+
replacement, replace_color_within_range
7171
);
7272
}
7373
#endif
@@ -77,7 +77,7 @@ size_t filter_rgb32_euclidean(
7777
in, in_bytes_per_row, width, height,
7878
out, out_bytes_per_row,
7979
expected, max_euclidean_distance,
80-
replacement, invert
80+
replacement, replace_color_within_range
8181
);
8282
}
8383
#endif
@@ -87,15 +87,15 @@ size_t filter_rgb32_euclidean(
8787
in, in_bytes_per_row, width, height,
8888
out, out_bytes_per_row,
8989
expected, max_euclidean_distance,
90-
replacement, invert
90+
replacement, replace_color_within_range
9191
);
9292
}
9393
#endif
9494
return filter_rgb32_euclidean_Default(
9595
in, in_bytes_per_row, width, height,
9696
out, out_bytes_per_row,
9797
expected, max_euclidean_distance,
98-
replacement, invert
98+
replacement, replace_color_within_range
9999
);
100100
}
101101

‎SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ size_t filter_rgb32_euclidean(
2121
const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
2222
uint32_t* out, size_t out_bytes_per_row,
2323
uint32_t expected, double max_euclidean_distance,
24-
uint32_t replacement, bool invert
24+
uint32_t replacement, bool replace_color_within_range
2525
);
2626

2727

‎SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_ARM64_NEON.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@ class ImageFilter_RgbEuclidean_arm64_NEON{
2121
using Mask = size_t;
2222

2323
public:
24-
ImageFilter_RgbEuclidean_arm64_NEON(uint32_t expected_color, double max_euclidean_distance,
25-
uint32_t replacement_color, bool replace_color_within_range)
24+
ImageFilter_RgbEuclidean_arm64_NEON(
25+
uint32_t expected_color, double max_euclidean_distance,
26+
uint32_t replacement_color, bool replace_color_within_range
27+
)
2628
: m_expected_color_rgb_u8(vreinterpretq_u8_u32(vdupq_n_u32(expected_color & 0x00ffffff)))
2729
, m_distance_squared_u32(vdupq_n_u32((uint32_t)(max_euclidean_distance * max_euclidean_distance)))
2830
, m_replacement_color_u32(vdupq_n_u32(replacement_color))

‎SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_Default.cpp‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ class ImageFilter_RgbEuclidean_Default{
1919
using Mask = size_t;
2020

2121
public:
22-
ImageFilter_RgbEuclidean_Default(uint32_t expected_color, double max_euclidean_distance, uint32_t replacement_color, bool replace_color_within_range)
22+
ImageFilter_RgbEuclidean_Default(
23+
uint32_t expected_color, double max_euclidean_distance,
24+
uint32_t replacement_color, bool replace_color_within_range
25+
)
2326
: m_replacement_color(replacement_color)
2427
, m_replace_color_within_range(replace_color_within_range ? 1 : 0)
2528
, m_expected_r((expected_color & 0x00ff0000) >> 16)
@@ -35,7 +38,6 @@ class ImageFilter_RgbEuclidean_Default{
3538

3639
PA_FORCE_INLINE void process_full(uint32_t* out, const uint32_t* in){
3740
uint32_t pixel = in[0];
38-
uint32_t ret = 1;
3941
uint32_t sum_sqr = 0;
4042
{
4143
uint32_t p = (pixel & 0x00ff0000) >> 16;
@@ -52,7 +54,7 @@ class ImageFilter_RgbEuclidean_Default{
5254
p -= m_expected_b;
5355
sum_sqr += p * p;
5456
}
55-
ret = sum_sqr <= m_max_distance_squared;
57+
uint32_t ret = sum_sqr <= m_max_distance_squared;
5658
m_count += ret;
5759
ret ^= m_replace_color_within_range;
5860
out[0] = ret ? pixel : m_replacement_color;

‎SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_x64_AVX2.cpp‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,12 @@ class ImageFilter_RgbEuclidean_x64_AVX2{
2222
using Mask = PartialWordAccess32_x64_AVX2;
2323

2424
public:
25-
ImageFilter_RgbEuclidean_x64_AVX2(uint32_t expected, double max_euclidean_distance, uint32_t replacement, bool invert)
25+
ImageFilter_RgbEuclidean_x64_AVX2(
26+
uint32_t expected, double max_euclidean_distance,
27+
uint32_t replacement, bool replace_color_within_range
28+
)
2629
: m_replacement(_mm256_set1_epi32(replacement))
27-
, m_invert(invert ? _mm256_set1_epi32(-1) : _mm256_setzero_si256())
30+
, m_invert(replace_color_within_range ? _mm256_set1_epi32(-1) : _mm256_setzero_si256())
2831
, m_expected_ag(_mm256_set1_epi32((expected >> 8) & 0x000000ff))
2932
, m_expected_rb(_mm256_set1_epi32(expected & 0x00ff00ff))
3033
, m_distance_squared(_mm256_set1_epi32((uint32_t)(max_euclidean_distance * max_euclidean_distance)))
@@ -81,9 +84,9 @@ size_t filter_rgb32_euclidean_x64_AVX2(
8184
const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
8285
uint32_t* out, size_t out_bytes_per_row,
8386
uint32_t expected, double max_euclidean_distance,
84-
uint32_t replacement, bool invert
87+
uint32_t replacement, bool replace_color_within_range
8588
){
86-
ImageFilter_RgbEuclidean_x64_AVX2 filter(expected, max_euclidean_distance, replacement, invert);
89+
ImageFilter_RgbEuclidean_x64_AVX2 filter(expected, max_euclidean_distance, replacement, replace_color_within_range);
8790
filter_per_pixel(in, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
8891
return filter.count();
8992
}

‎SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_x64_AVX512.cpp‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,12 @@ class ImageFilterRunner_Rgb32Euclidean_x64_AVX512{
3434
using Mask = PartialWordMask;
3535

3636
public:
37-
ImageFilterRunner_Rgb32Euclidean_x64_AVX512(uint32_t expected, double max_euclidean_distance, uint32_t replacement, bool invert)
37+
ImageFilterRunner_Rgb32Euclidean_x64_AVX512(
38+
uint32_t expected, double max_euclidean_distance,
39+
uint32_t replacement, bool replace_color_within_range
40+
)
3841
: m_replacement(_mm512_set1_epi32(replacement))
39-
, m_invert(invert ? 0xffff : 0)
42+
, m_invert(replace_color_within_range ? 0xffff : 0)
4043
, m_expected_ag(_mm512_set1_epi32((expected >> 8) & 0x000000ff))
4144
, m_expected_rb(_mm512_set1_epi32(expected & 0x00ff00ff))
4245
, m_distance_squared(_mm512_set1_epi32((uint32_t)(max_euclidean_distance * max_euclidean_distance)))
@@ -93,9 +96,9 @@ size_t filter_rgb32_euclidean_x64_AVX512(
9396
const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
9497
uint32_t* out, size_t out_bytes_per_row,
9598
uint32_t expected, double max_euclidean_distance,
96-
uint32_t replacement, bool invert
99+
uint32_t replacement, bool replace_color_within_range
97100
){
98-
ImageFilterRunner_Rgb32Euclidean_x64_AVX512 filter(expected, max_euclidean_distance, replacement, invert);
101+
ImageFilterRunner_Rgb32Euclidean_x64_AVX512 filter(expected, max_euclidean_distance, replacement, replace_color_within_range);
99102
filter_per_pixel(in, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
100103
return filter.count();
101104
}

‎SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_x64_SSE42.cpp‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,12 @@ class ImageFilter_RgbEuclidean_x64_SSE42{
4040
using Mask = PartialWordMask;
4141

4242
public:
43-
ImageFilter_RgbEuclidean_x64_SSE42(uint32_t expected, double max_euclidean_distance, uint32_t replacement, bool invert)
43+
ImageFilter_RgbEuclidean_x64_SSE42(
44+
uint32_t expected, double max_euclidean_distance,
45+
uint32_t replacement, bool replace_color_within_range
46+
)
4447
: m_replacement(_mm_set1_epi32(replacement))
45-
, m_invert(invert ? _mm_set1_epi32(-1) : _mm_setzero_si128())
48+
, m_invert(replace_color_within_range ? _mm_set1_epi32(-1) : _mm_setzero_si128())
4649
, m_expected_g(_mm_set1_epi32((expected >> 8) & 0x000000ff))
4750
, m_expected_rb(_mm_set1_epi32(expected & 0x00ff00ff))
4851
, m_distance_squared(_mm_set1_epi32((uint32_t)(max_euclidean_distance * max_euclidean_distance)))
@@ -113,9 +116,9 @@ size_t filter_rgb32_euclidean_x64_SSE42(
113116
const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
114117
uint32_t* out, size_t out_bytes_per_row,
115118
uint32_t expected, double max_euclidean_distance,
116-
uint32_t replacement, bool invert
119+
uint32_t replacement, bool replace_color_within_range
117120
){
118-
ImageFilter_RgbEuclidean_x64_SSE42 filter(expected, max_euclidean_distance, replacement, invert);
121+
ImageFilter_RgbEuclidean_x64_SSE42 filter(expected, max_euclidean_distance, replacement, replace_color_within_range);
119122
filter_per_pixel(in, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
120123
return filter.count();
121124
}

‎SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range.cpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,37 +18,37 @@ size_t filter_rgb32_range_Default(
1818
const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
1919
uint32_t* out, size_t out_bytes_per_row,
2020
uint32_t mins, uint32_t maxs,
21-
uint32_t replacement, bool invert
21+
uint32_t replacement, bool replace_color_within_range
2222
);
2323
size_t filter_rgb32_range_x64_SSE42(
2424
const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
2525
uint32_t* out, size_t out_bytes_per_row,
2626
uint32_t mins, uint32_t maxs,
27-
uint32_t replacement, bool invert
27+
uint32_t replacement, bool replace_color_within_range
2828
);
2929
size_t filter_rgb32_range_x64_AVX2(
3030
const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
3131
uint32_t* out, size_t out_bytes_per_row,
3232
uint32_t mins, uint32_t maxs,
33-
uint32_t replacement, bool invert
33+
uint32_t replacement, bool replace_color_within_range
3434
);
3535
size_t filter_rgb32_range_x64_AVX512(
3636
const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
3737
uint32_t* out, size_t out_bytes_per_row,
3838
uint32_t mins, uint32_t maxs,
39-
uint32_t replacement, bool invert
39+
uint32_t replacement, bool replace_color_within_range
4040
);
4141
size_t filter_rgb32_range_arm64_NEON(
4242
const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
4343
uint32_t* out, size_t out_bytes_per_row,
4444
uint32_t mins, uint32_t maxs,
45-
uint32_t replacement, bool invert
45+
uint32_t replacement, bool replace_color_within_range
4646
);
4747
size_t filter_rgb32_range(
4848
const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
4949
uint32_t* out, size_t out_bytes_per_row,
5050
uint32_t mins, uint32_t maxs,
51-
uint32_t replacement, bool invert
51+
uint32_t replacement, bool replace_color_within_range
5252
){
5353
if (width * height > 0xffffffff){
5454
throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Image is too large. more than 2^32 pixels.");
@@ -57,37 +57,37 @@ size_t filter_rgb32_range(
5757
if (CPU_CAPABILITY_CURRENT.OK_17_Skylake){
5858
return filter_rgb32_range_x64_AVX512(
5959
in, in_bytes_per_row, width, height,
60-
out, out_bytes_per_row, mins, maxs, replacement, invert
60+
out, out_bytes_per_row, mins, maxs, replacement, replace_color_within_range
6161
);
6262
}
6363
#endif
6464
#ifdef PA_AutoDispatch_x64_13_Haswell
6565
if (CPU_CAPABILITY_CURRENT.OK_13_Haswell){
6666
return filter_rgb32_range_x64_AVX2(
6767
in, in_bytes_per_row, width, height,
68-
out, out_bytes_per_row, mins, maxs, replacement, invert
68+
out, out_bytes_per_row, mins, maxs, replacement, replace_color_within_range
6969
);
7070
}
7171
#endif
7272
#ifdef PA_AutoDispatch_x64_08_Nehalem
7373
if (CPU_CAPABILITY_CURRENT.OK_08_Nehalem){
7474
return filter_rgb32_range_x64_SSE42(
7575
in, in_bytes_per_row, width, height,
76-
out, out_bytes_per_row, mins, maxs, replacement, invert
76+
out, out_bytes_per_row, mins, maxs, replacement, replace_color_within_range
7777
);
7878
}
7979
#endif
8080
#ifdef PA_AutoDispatch_arm64_20_M1
8181
if (CPU_CAPABILITY_CURRENT.OK_M1){
8282
return filter_rgb32_range_arm64_NEON(
8383
in, in_bytes_per_row, width, height,
84-
out, out_bytes_per_row, mins, maxs, replacement, invert
84+
out, out_bytes_per_row, mins, maxs, replacement, replace_color_within_range
8585
);
8686
}
8787
#endif
8888
return filter_rgb32_range_Default(
8989
in, in_bytes_per_row, width, height,
90-
out, out_bytes_per_row, mins, maxs, replacement, invert
90+
out, out_bytes_per_row, mins, maxs, replacement, replace_color_within_range
9191
);
9292
}
9393

‎SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_ARM64_NEON.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@ class ImageFilterRunner_Rgb32Range_ARM64_NEON{
2222
using Mask = size_t;
2323

2424
public:
25-
ImageFilterRunner_Rgb32Range_ARM64_NEON(uint32_t mins, uint32_t maxs, uint32_t replacement_color,
26-
bool replace_color_within_range)
25+
ImageFilterRunner_Rgb32Range_ARM64_NEON(
26+
uint32_t mins, uint32_t maxs,
27+
uint32_t replacement_color, bool replace_color_within_range
28+
)
2729
: m_mins_u8(vreinterpretq_u8_u32(vdupq_n_u32(mins)))
2830
, m_maxs_u8(vreinterpretq_u8_u32(vdupq_n_u32(maxs)))
2931
, m_zeros_u8(vreinterpretq_u32_u8(vdupq_n_u8(0)))

0 commit comments

Comments
 (0)