Skip to content

Commit e593110

Browse files
committed
Cleanup.
1 parent d8384bf commit e593110

6 files changed

+19
-20
lines changed

SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
#include <stdint.h>
1313
#include <cstddef>
14-
#include "Common/Cpp/PixelRGB32.h"
1514

1615
namespace PokemonAutomation{
1716
namespace Kernels{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class PixelTest_Rgb32Range_ARM64_NEON{
2828

2929
public:
3030
PA_FORCE_INLINE PixelTest_Rgb32Range_ARM64_NEON(
31-
PixelRGB32 mins, PixelRGB32 maxs
31+
uint32_t mins, uint32_t maxs
3232
)
3333
: m_mins_u8(vreinterpretq_u8_u32(vdupq_n_u32(mins)))
3434
, m_maxs_u8(vreinterpretq_u8_u32(vdupq_n_u32(maxs)))

SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_Default.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@ class PixelTest_Rgb32Range_Default{
2424

2525
public:
2626
PA_FORCE_INLINE PixelTest_Rgb32Range_Default(
27-
PixelRGB32 mins, PixelRGB32 maxs
27+
uint32_t mins, uint32_t maxs
2828
)
29-
: m_shiftB(mins.u32 & 0x000000ff)
30-
, m_shiftG(mins.u32 & 0x0000ff00)
31-
, m_shiftR(mins.u32 & 0x00ff0000)
32-
, m_shiftA(mins.u32 & 0xff000000)
33-
, m_thresholdB((maxs.u32 & 0x000000ff) - m_shiftB)
34-
, m_thresholdG((maxs.u32 & 0x0000ff00) - m_shiftG)
35-
, m_thresholdR((maxs.u32 & 0x00ff0000) - m_shiftR)
36-
, m_thresholdA((maxs.u32 & 0xff000000) - m_shiftA)
29+
: m_shiftB(mins & 0x000000ff)
30+
, m_shiftG(mins & 0x0000ff00)
31+
, m_shiftR(mins & 0x00ff0000)
32+
, m_shiftA(mins & 0xff000000)
33+
, m_thresholdB((maxs & 0x000000ff) - m_shiftB)
34+
, m_thresholdG((maxs & 0x0000ff00) - m_shiftG)
35+
, m_thresholdR((maxs & 0x00ff0000) - m_shiftR)
36+
, m_thresholdA((maxs & 0xff000000) - m_shiftA)
3737
{}
3838
PA_FORCE_INLINE PixelTest_Rgb32Range_Default(
3939
const ToBlackWhiteRgb32RangeFilter& filter

SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_x64_AVX2.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ class PixelTest_Rgb32Range_x64_AVX2{
3232

3333
public:
3434
PA_FORCE_INLINE PixelTest_Rgb32Range_x64_AVX2(
35-
PixelRGB32 mins, PixelRGB32 maxs
35+
uint32_t mins, uint32_t maxs
3636
)
37-
: m_mins(_mm256_set1_epi32(mins.u32 ^ 0x80808080))
38-
, m_maxs(_mm256_set1_epi32(maxs.u32 ^ 0x80808080))
37+
: m_mins(_mm256_set1_epi32(mins ^ 0x80808080))
38+
, m_maxs(_mm256_set1_epi32(maxs ^ 0x80808080))
3939
{}
4040
PA_FORCE_INLINE PixelTest_Rgb32Range_x64_AVX2(
4141
const ToBlackWhiteRgb32RangeFilter& filter

SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_x64_AVX512.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ class PixelTest_Rgb32Range_x64_AVX512{
3030

3131
public:
3232
PA_FORCE_INLINE PixelTest_Rgb32Range_x64_AVX512(
33-
PixelRGB32 mins, PixelRGB32 maxs
33+
uint32_t mins, uint32_t maxs
3434
)
35-
: m_shift(_mm512_set1_epi32(mins.u32))
36-
, m_threshold(_mm512_sub_epi8(_mm512_set1_epi32(maxs.u32), m_shift))
35+
: m_shift(_mm512_set1_epi32(mins))
36+
, m_threshold(_mm512_sub_epi8(_mm512_set1_epi32(maxs), m_shift))
3737
{}
3838
PA_FORCE_INLINE PixelTest_Rgb32Range_x64_AVX512(
3939
const ToBlackWhiteRgb32RangeFilter& filter

SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_x64_SSE42.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ class PixelTest_Rgb32Range_x64_SSE42{
3232

3333
public:
3434
PA_FORCE_INLINE PixelTest_Rgb32Range_x64_SSE42(
35-
PixelRGB32 mins, PixelRGB32 maxs
35+
uint32_t mins, uint32_t maxs
3636
)
37-
: m_mins(_mm_set1_epi32(mins.u32 ^ 0x80808080))
38-
, m_maxs(_mm_set1_epi32(maxs.u32 ^ 0x80808080))
37+
: m_mins(_mm_set1_epi32(mins ^ 0x80808080))
38+
, m_maxs(_mm_set1_epi32(maxs ^ 0x80808080))
3939
{}
4040
PA_FORCE_INLINE PixelTest_Rgb32Range_x64_SSE42(
4141
const ToBlackWhiteRgb32RangeFilter& filter

0 commit comments

Comments
 (0)