Speed up HQ2x/HQ3x C++ version a bit (about 20% faster with -O3 on my system)

svn-id: r36087

1 files changed, 42 insertions, 44 deletions

diff --git a/graphics/scaler/hq3x.cpp b/graphics/scaler/hq3x.cpp
index b225fcae87..b40c85d56a 100644
--- a/graphics/scaler/hq3x.cpp
+++ b/graphics/scaler/hq3x.cpp
@@ -39,80 +39,80 @@ void hq3x_16(const byte *, byte *, uint32, uint32, uint32, uint32);
 
 }
 
-void HQ3x(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) {
+void HQ3x_ASM(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) {
 	hq3x_16(srcPtr, dstPtr, width, height, srcPitch, dstPitch);
 }
 
-#else
+#endif
 
-#define PIXEL00_1M  *(q) = interpolate16_2<bitFormat,3,1>(w5, w1);
-#define PIXEL00_1U  *(q) = interpolate16_2<bitFormat,3,1>(w5, w2);
-#define PIXEL00_1L  *(q) = interpolate16_2<bitFormat,3,1>(w5, w4);
-#define PIXEL00_2   *(q) = interpolate16_3<bitFormat,2,1,1>(w5, w4, w2);
-#define PIXEL00_4   *(q) = interpolate16_3<bitFormat,2,7,7>(w5, w4, w2);
-#define PIXEL00_5   *(q) = interpolate16_2<bitFormat,1,1>(w4, w2);
+#define PIXEL00_1M  *(q) = interpolate16_3_1<ColorMask>(w5, w1);
+#define PIXEL00_1U  *(q) = interpolate16_3_1<ColorMask>(w5, w2);
+#define PIXEL00_1L  *(q) = interpolate16_3_1<ColorMask>(w5, w4);
+#define PIXEL00_2   *(q) = interpolate16_2_1_1<ColorMask>(w5, w4, w2);
+#define PIXEL00_4   *(q) = interpolate16_2_7_7<ColorMask>(w5, w4, w2);
+#define PIXEL00_5   *(q) = interpolate16_1_1<ColorMask>(w4, w2);
 #define PIXEL00_C   *(q) = w5;
 
-#define PIXEL01_1   *(q+1) = interpolate16_2<bitFormat,3,1>(w5, w2);
-#define PIXEL01_3   *(q+1) = interpolate16_2<bitFormat,7,1>(w5, w2);
-#define PIXEL01_6   *(q+1) = interpolate16_2<bitFormat,3,1>(w2, w5);
+#define PIXEL01_1   *(q+1) = interpolate16_3_1<ColorMask>(w5, w2);
+#define PIXEL01_3   *(q+1) = interpolate16_7_1<ColorMask>(w5, w2);
+#define PIXEL01_6   *(q+1) = interpolate16_3_1<ColorMask>(w2, w5);
 #define PIXEL01_C   *(q+1) = w5;
 
-#define PIXEL02_1M  *(q+2) = interpolate16_2<bitFormat,3,1>(w5, w3);
-#define PIXEL02_1U  *(q+2) = interpolate16_2<bitFormat,3,1>(w5, w2);
-#define PIXEL02_1R  *(q+2) = interpolate16_2<bitFormat,3,1>(w5, w6);
-#define PIXEL02_2   *(q+2) = interpolate16_3<bitFormat,2,1,1>(w5, w2, w6);
-#define PIXEL02_4   *(q+2) = interpolate16_3<bitFormat,2,7,7>(w5, w2, w6);
-#define PIXEL02_5   *(q+2) = interpolate16_2<bitFormat,1,1>(w2, w6);
+#define PIXEL02_1M  *(q+2) = interpolate16_3_1<ColorMask>(w5, w3);
+#define PIXEL02_1U  *(q+2) = interpolate16_3_1<ColorMask>(w5, w2);
+#define PIXEL02_1R  *(q+2) = interpolate16_3_1<ColorMask>(w5, w6);
+#define PIXEL02_2   *(q+2) = interpolate16_2_1_1<ColorMask>(w5, w2, w6);
+#define PIXEL02_4   *(q+2) = interpolate16_2_7_7<ColorMask>(w5, w2, w6);
+#define PIXEL02_5   *(q+2) = interpolate16_1_1<ColorMask>(w2, w6);
 #define PIXEL02_C   *(q+2) = w5;
 
-#define PIXEL10_1   *(q+nextlineDst) = interpolate16_2<bitFormat,3,1>(w5, w4);
-#define PIXEL10_3   *(q+nextlineDst) = interpolate16_2<bitFormat,7,1>(w5, w4);
-#define PIXEL10_6   *(q+nextlineDst) = interpolate16_2<bitFormat,3,1>(w4, w5);
+#define PIXEL10_1   *(q+nextlineDst) = interpolate16_3_1<ColorMask>(w5, w4);
+#define PIXEL10_3   *(q+nextlineDst) = interpolate16_7_1<ColorMask>(w5, w4);
+#define PIXEL10_6   *(q+nextlineDst) = interpolate16_3_1<ColorMask>(w4, w5);
 #define PIXEL10_C   *(q+nextlineDst) = w5;
 
 #define PIXEL11     *(q+1+nextlineDst) = w5;
 
-#define PIXEL12_1   *(q+2+nextlineDst) = interpolate16_2<bitFormat,3,1>(w5, w6);
-#define PIXEL12_3   *(q+2+nextlineDst) = interpolate16_2<bitFormat,7,1>(w5, w6);
-#define PIXEL12_6   *(q+2+nextlineDst) = interpolate16_2<bitFormat,3,1>(w6, w5);
+#define PIXEL12_1   *(q+2+nextlineDst) = interpolate16_3_1<ColorMask>(w5, w6);
+#define PIXEL12_3   *(q+2+nextlineDst) = interpolate16_7_1<ColorMask>(w5, w6);
+#define PIXEL12_6   *(q+2+nextlineDst) = interpolate16_3_1<ColorMask>(w6, w5);
 #define PIXEL12_C   *(q+2+nextlineDst) = w5;
 
-#define PIXEL20_1M  *(q+nextlineDst2) = interpolate16_2<bitFormat,3,1>(w5, w7);
-#define PIXEL20_1D  *(q+nextlineDst2) = interpolate16_2<bitFormat,3,1>(w5, w8);
-#define PIXEL20_1L  *(q+nextlineDst2) = interpolate16_2<bitFormat,3,1>(w5, w4);
-#define PIXEL20_2   *(q+nextlineDst2) = interpolate16_3<bitFormat,2,1,1>(w5, w8, w4);
-#define PIXEL20_4   *(q+nextlineDst2) = interpolate16_3<bitFormat,2,7,7>(w5, w8, w4);
-#define PIXEL20_5   *(q+nextlineDst2) = interpolate16_2<bitFormat,1,1>(w8, w4);
+#define PIXEL20_1M  *(q+nextlineDst2) = interpolate16_3_1<ColorMask>(w5, w7);
+#define PIXEL20_1D  *(q+nextlineDst2) = interpolate16_3_1<ColorMask>(w5, w8);
+#define PIXEL20_1L  *(q+nextlineDst2) = interpolate16_3_1<ColorMask>(w5, w4);
+#define PIXEL20_2   *(q+nextlineDst2) = interpolate16_2_1_1<ColorMask>(w5, w8, w4);
+#define PIXEL20_4   *(q+nextlineDst2) = interpolate16_2_7_7<ColorMask>(w5, w8, w4);
+#define PIXEL20_5   *(q+nextlineDst2) = interpolate16_1_1<ColorMask>(w8, w4);
 #define PIXEL20_C   *(q+nextlineDst2) = w5;
 
-#define PIXEL21_1   *(q+1+nextlineDst2) = interpolate16_2<bitFormat,3,1>(w5, w8);
-#define PIXEL21_3   *(q+1+nextlineDst2) = interpolate16_2<bitFormat,7,1>(w5, w8);
-#define PIXEL21_6   *(q+1+nextlineDst2) = interpolate16_2<bitFormat,3,1>(w8, w5);
+#define PIXEL21_1   *(q+1+nextlineDst2) = interpolate16_3_1<ColorMask>(w5, w8);
+#define PIXEL21_3   *(q+1+nextlineDst2) = interpolate16_7_1<ColorMask>(w5, w8);
+#define PIXEL21_6   *(q+1+nextlineDst2) = interpolate16_3_1<ColorMask>(w8, w5);
 #define PIXEL21_C   *(q+1+nextlineDst2) = w5;
 
-#define PIXEL22_1M  *(q+2+nextlineDst2) = interpolate16_2<bitFormat,3,1>(w5, w9);
-#define PIXEL22_1D  *(q+2+nextlineDst2) = interpolate16_2<bitFormat,3,1>(w5, w8);
-#define PIXEL22_1R  *(q+2+nextlineDst2) = interpolate16_2<bitFormat,3,1>(w5, w6);
-#define PIXEL22_2   *(q+2+nextlineDst2) = interpolate16_3<bitFormat,2,1,1>(w5, w6, w8);
-#define PIXEL22_4   *(q+2+nextlineDst2) = interpolate16_3<bitFormat,2,7,7>(w5, w6, w8);
-#define PIXEL22_5   *(q+2+nextlineDst2) = interpolate16_2<bitFormat,1,1>(w6, w8);
+#define PIXEL22_1M  *(q+2+nextlineDst2) = interpolate16_3_1<ColorMask>(w5, w9);
+#define PIXEL22_1D  *(q+2+nextlineDst2) = interpolate16_3_1<ColorMask>(w5, w8);
+#define PIXEL22_1R  *(q+2+nextlineDst2) = interpolate16_3_1<ColorMask>(w5, w6);
+#define PIXEL22_2   *(q+2+nextlineDst2) = interpolate16_2_1_1<ColorMask>(w5, w6, w8);
+#define PIXEL22_4   *(q+2+nextlineDst2) = interpolate16_2_7_7<ColorMask>(w5, w6, w8);
+#define PIXEL22_5   *(q+2+nextlineDst2) = interpolate16_1_1<ColorMask>(w6, w8);
 #define PIXEL22_C   *(q+2+nextlineDst2) = w5;
 
 #define YUV(x)	RGBtoYUV[w ## x]
 
 
-#define bitFormat 565
+#define ColorMask Graphics::ColorMasks<565>
 void HQ3x_565(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) {
 	#include "graphics/scaler/hq3x.h"
 }
-#undef bitFormat
+#undef ColorMask
 
-#define bitFormat 555
+#define ColorMask Graphics::ColorMasks<555>
 void HQ3x_555(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) {
 	#include "graphics/scaler/hq3x.h"
 }
-#undef bitFormat
+#undef ColorMask
 
 
 void HQ3x(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) {
@@ -121,5 +121,3 @@ void HQ3x(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch,
 	else
 		HQ3x_555(srcPtr, srcPitch, dstPtr, dstPitch, width, height);
 }
-
-#endif