diff options
Diffstat (limited to 'graphics/scaler/hq2x.cpp')
| -rw-r--r-- | graphics/scaler/hq2x.cpp | 102 |
1 files changed, 50 insertions, 52 deletions
diff --git a/graphics/scaler/hq2x.cpp b/graphics/scaler/hq2x.cpp index bef97e7251..df1c34626f 100644 --- a/graphics/scaler/hq2x.cpp +++ b/graphics/scaler/hq2x.cpp @@ -38,78 +38,78 @@ void hq2x_16(const byte *, byte *, uint32, uint32, uint32, uint32); } -void HQ2x(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) { +void HQ2x_ASM(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) { hq2x_16(srcPtr, dstPtr, width, height, srcPitch, dstPitch); } -#else +#endif #define PIXEL00_0 *(q) = w5; -#define PIXEL00_10 *(q) = interpolate16_2<bitFormat,3,1>(w5, w1); -#define PIXEL00_11 *(q) = interpolate16_2<bitFormat,3,1>(w5, w4); -#define PIXEL00_12 *(q) = interpolate16_2<bitFormat,3,1>(w5, w2); -#define PIXEL00_20 *(q) = interpolate16_3<bitFormat,2,1,1>(w5, w4, w2); -#define PIXEL00_21 *(q) = interpolate16_3<bitFormat,2,1,1>(w5, w1, w2); -#define PIXEL00_22 *(q) = interpolate16_3<bitFormat,2,1,1>(w5, w1, w4); -#define PIXEL00_60 *(q) = interpolate16_3<bitFormat,5,2,1>(w5, w2, w4); -#define PIXEL00_61 *(q) = interpolate16_3<bitFormat,5,2,1>(w5, w4, w2); -#define PIXEL00_70 *(q) = interpolate16_3<bitFormat,6,1,1>(w5, w4, w2); -#define PIXEL00_90 *(q) = interpolate16_3<bitFormat,2,3,3>(w5, w4, w2); -#define PIXEL00_100 *(q) = interpolate16_3<bitFormat,14,1,1>(w5, w4, w2); +#define PIXEL00_10 *(q) = interpolate16_3_1<ColorMask>(w5, w1); +#define PIXEL00_11 *(q) = interpolate16_3_1<ColorMask>(w5, w4); +#define PIXEL00_12 *(q) = interpolate16_3_1<ColorMask>(w5, w2); +#define PIXEL00_20 *(q) = interpolate16_2_1_1<ColorMask>(w5, w4, w2); +#define PIXEL00_21 *(q) = interpolate16_2_1_1<ColorMask>(w5, w1, w2); +#define PIXEL00_22 *(q) = interpolate16_2_1_1<ColorMask>(w5, w1, w4); +#define PIXEL00_60 *(q) = interpolate16_5_2_1<ColorMask>(w5, w2, w4); +#define PIXEL00_61 *(q) = interpolate16_5_2_1<ColorMask>(w5, w4, w2); +#define PIXEL00_70 *(q) = interpolate16_6_1_1<ColorMask>(w5, w4, w2); +#define PIXEL00_90 *(q) = interpolate16_2_3_3<ColorMask>(w5, w4, w2); +#define PIXEL00_100 *(q) = interpolate16_14_1_1<ColorMask>(w5, w4, w2); #define PIXEL01_0 *(q+1) = w5; -#define PIXEL01_10 *(q+1) = interpolate16_2<bitFormat,3,1>(w5, w3); -#define PIXEL01_11 *(q+1) = interpolate16_2<bitFormat,3,1>(w5, w2); -#define PIXEL01_12 *(q+1) = interpolate16_2<bitFormat,3,1>(w5, w6); -#define PIXEL01_20 *(q+1) = interpolate16_3<bitFormat,2,1,1>(w5, w2, w6); -#define PIXEL01_21 *(q+1) = interpolate16_3<bitFormat,2,1,1>(w5, w3, w6); -#define PIXEL01_22 *(q+1) = interpolate16_3<bitFormat,2,1,1>(w5, w3, w2); -#define PIXEL01_60 *(q+1) = interpolate16_3<bitFormat,5,2,1>(w5, w6, w2); -#define PIXEL01_61 *(q+1) = interpolate16_3<bitFormat,5,2,1>(w5, w2, w6); -#define PIXEL01_70 *(q+1) = interpolate16_3<bitFormat,6,1,1>(w5, w2, w6); -#define PIXEL01_90 *(q+1) = interpolate16_3<bitFormat,2,3,3>(w5, w2, w6); -#define PIXEL01_100 *(q+1) = interpolate16_3<bitFormat,14,1,1>(w5, w2, w6); +#define PIXEL01_10 *(q+1) = interpolate16_3_1<ColorMask>(w5, w3); +#define PIXEL01_11 *(q+1) = interpolate16_3_1<ColorMask>(w5, w2); +#define PIXEL01_12 *(q+1) = interpolate16_3_1<ColorMask>(w5, w6); +#define PIXEL01_20 *(q+1) = interpolate16_2_1_1<ColorMask>(w5, w2, w6); +#define PIXEL01_21 *(q+1) = interpolate16_2_1_1<ColorMask>(w5, w3, w6); +#define PIXEL01_22 *(q+1) = interpolate16_2_1_1<ColorMask>(w5, w3, w2); +#define PIXEL01_60 *(q+1) = interpolate16_5_2_1<ColorMask>(w5, w6, w2); +#define PIXEL01_61 *(q+1) = interpolate16_5_2_1<ColorMask>(w5, w2, w6); +#define PIXEL01_70 *(q+1) = interpolate16_6_1_1<ColorMask>(w5, w2, w6); +#define PIXEL01_90 *(q+1) = interpolate16_2_3_3<ColorMask>(w5, w2, w6); +#define PIXEL01_100 *(q+1) = interpolate16_14_1_1<ColorMask>(w5, w2, w6); #define PIXEL10_0 *(q+nextlineDst) = w5; -#define PIXEL10_10 *(q+nextlineDst) = interpolate16_2<bitFormat,3,1>(w5, w7); -#define PIXEL10_11 *(q+nextlineDst) = interpolate16_2<bitFormat,3,1>(w5, w8); -#define PIXEL10_12 *(q+nextlineDst) = interpolate16_2<bitFormat,3,1>(w5, w4); -#define PIXEL10_20 *(q+nextlineDst) = interpolate16_3<bitFormat,2,1,1>(w5, w8, w4); -#define PIXEL10_21 *(q+nextlineDst) = interpolate16_3<bitFormat,2,1,1>(w5, w7, w4); -#define PIXEL10_22 *(q+nextlineDst) = interpolate16_3<bitFormat,2,1,1>(w5, w7, w8); -#define PIXEL10_60 *(q+nextlineDst) = interpolate16_3<bitFormat,5,2,1>(w5, w4, w8); -#define PIXEL10_61 *(q+nextlineDst) = interpolate16_3<bitFormat,5,2,1>(w5, w8, w4); -#define PIXEL10_70 *(q+nextlineDst) = interpolate16_3<bitFormat,6,1,1>(w5, w8, w4); -#define PIXEL10_90 *(q+nextlineDst) = interpolate16_3<bitFormat,2,3,3>(w5, w8, w4); -#define PIXEL10_100 *(q+nextlineDst) = interpolate16_3<bitFormat,14,1,1>(w5, w8, w4); +#define PIXEL10_10 *(q+nextlineDst) = interpolate16_3_1<ColorMask>(w5, w7); +#define PIXEL10_11 *(q+nextlineDst) = interpolate16_3_1<ColorMask>(w5, w8); +#define PIXEL10_12 *(q+nextlineDst) = interpolate16_3_1<ColorMask>(w5, w4); +#define PIXEL10_20 *(q+nextlineDst) = interpolate16_2_1_1<ColorMask>(w5, w8, w4); +#define PIXEL10_21 *(q+nextlineDst) = interpolate16_2_1_1<ColorMask>(w5, w7, w4); +#define PIXEL10_22 *(q+nextlineDst) = interpolate16_2_1_1<ColorMask>(w5, w7, w8); +#define PIXEL10_60 *(q+nextlineDst) = interpolate16_5_2_1<ColorMask>(w5, w4, w8); +#define PIXEL10_61 *(q+nextlineDst) = interpolate16_5_2_1<ColorMask>(w5, w8, w4); +#define PIXEL10_70 *(q+nextlineDst) = interpolate16_6_1_1<ColorMask>(w5, w8, w4); +#define PIXEL10_90 *(q+nextlineDst) = interpolate16_2_3_3<ColorMask>(w5, w8, w4); +#define PIXEL10_100 *(q+nextlineDst) = interpolate16_14_1_1<ColorMask>(w5, w8, w4); #define PIXEL11_0 *(q+1+nextlineDst) = w5; -#define PIXEL11_10 *(q+1+nextlineDst) = interpolate16_2<bitFormat,3,1>(w5, w9); -#define PIXEL11_11 *(q+1+nextlineDst) = interpolate16_2<bitFormat,3,1>(w5, w6); -#define PIXEL11_12 *(q+1+nextlineDst) = interpolate16_2<bitFormat,3,1>(w5, w8); -#define PIXEL11_20 *(q+1+nextlineDst) = interpolate16_3<bitFormat,2,1,1>(w5, w6, w8); -#define PIXEL11_21 *(q+1+nextlineDst) = interpolate16_3<bitFormat,2,1,1>(w5, w9, w8); -#define PIXEL11_22 *(q+1+nextlineDst) = interpolate16_3<bitFormat,2,1,1>(w5, w9, w6); -#define PIXEL11_60 *(q+1+nextlineDst) = interpolate16_3<bitFormat,5,2,1>(w5, w8, w6); -#define PIXEL11_61 *(q+1+nextlineDst) = interpolate16_3<bitFormat,5,2,1>(w5, w6, w8); -#define PIXEL11_70 *(q+1+nextlineDst) = interpolate16_3<bitFormat,6,1,1>(w5, w6, w8); -#define PIXEL11_90 *(q+1+nextlineDst) = interpolate16_3<bitFormat,2,3,3>(w5, w6, w8); -#define PIXEL11_100 *(q+1+nextlineDst) = interpolate16_3<bitFormat,14,1,1>(w5, w6, w8); +#define PIXEL11_10 *(q+1+nextlineDst) = interpolate16_3_1<ColorMask>(w5, w9); +#define PIXEL11_11 *(q+1+nextlineDst) = interpolate16_3_1<ColorMask>(w5, w6); +#define PIXEL11_12 *(q+1+nextlineDst) = interpolate16_3_1<ColorMask>(w5, w8); +#define PIXEL11_20 *(q+1+nextlineDst) = interpolate16_2_1_1<ColorMask>(w5, w6, w8); +#define PIXEL11_21 *(q+1+nextlineDst) = interpolate16_2_1_1<ColorMask>(w5, w9, w8); +#define PIXEL11_22 *(q+1+nextlineDst) = interpolate16_2_1_1<ColorMask>(w5, w9, w6); +#define PIXEL11_60 *(q+1+nextlineDst) = interpolate16_5_2_1<ColorMask>(w5, w8, w6); +#define PIXEL11_61 *(q+1+nextlineDst) = interpolate16_5_2_1<ColorMask>(w5, w6, w8); +#define PIXEL11_70 *(q+1+nextlineDst) = interpolate16_6_1_1<ColorMask>(w5, w6, w8); +#define PIXEL11_90 *(q+1+nextlineDst) = interpolate16_2_3_3<ColorMask>(w5, w6, w8); +#define PIXEL11_100 *(q+1+nextlineDst) = interpolate16_14_1_1<ColorMask>(w5, w6, w8); #define YUV(x) RGBtoYUV[w ## x] -#define bitFormat 565 +#define ColorMask Graphics::ColorMasks<565> void HQ2x_565(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) { #include "graphics/scaler/hq2x.h" } -#undef bitFormat +#undef ColorMask -#define bitFormat 555 +#define ColorMask Graphics::ColorMasks<555> void HQ2x_555(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) { #include "graphics/scaler/hq2x.h" } -#undef bitFormat +#undef ColorMask void HQ2x(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) { @@ -118,5 +118,3 @@ void HQ2x(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, else HQ2x_555(srcPtr, srcPitch, dstPtr, dstPitch, width, height); } - -#endif //Assembly version |