X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=tests%2Ftest.sh;h=fe3317433d14716f71b651981114c23015ea5759;hb=0023f5f7e3f7cdd37abb18ff94fc26f042d0c963;hp=ce23105b251254ea9a5e9edba67b4ac0ff19a8ac;hpb=2077f5ad8f75811eb4ec91b2b30b233d74ab99f0;p=android-x86%2Fexternal-s2tc.git

diff --git a/tests/test.sh b/tests/test.sh
index ce23105..fe33174 100644
--- a/tests/test.sh
+++ b/tests/test.sh
@@ -181,7 +181,8 @@ xon()
 # floor_tread01: GPLv2+
 xon textures/exx/floor/floor_tread01.tga floor_tread01.tga
 # floor_tread01_norm: GPLv2+
-xon textures/exx/floor/floor_tread01_norm.tga floor_tread01_norm.tga
+xon textures/exx/floor/floor_tread01_norm.tga floor_tread01_norm_dxt3.tga
+xon textures/exx/floor/floor_tread01_norm.tga floor_tread01_norm_dxt5.tga
 # base_concrete1a: GPLv2+
 xon textures/trak4x/base/base_concrete1a.tga base_concrete1a.tga
 # disabled: GPLv2+
@@ -197,17 +198,28 @@ if ! [ -f "amelia.tga" ]; then
 	wget -O- "http://www.godoon.com/gallery/media/slayers/amelia-wil-tesla-saillune/49212997-d81e-11df-8228-a8bfc396a36f.jpg" | convert JPG:- amelia.tga
 fi
 
-
-for i in dxtfail floor_tread01 floor_tread01_norm fract001 base_concrete1a disabled floor_tile3a lift02 sunset amelia noise noise_solid supernova; do
+for i in dxtfail floor_tread01 floor_tread01_norm_dxt5 floor_tread01_norm_dxt3 fract001 base_concrete1a disabled floor_tile3a lift02 sunset amelia noise noise_solid supernova; do
 	html_rowstart "$i"
 
 	html "$i".tga
 
 	case "$i" in
-		*_norm)
+		*_norm*)
+			goodmetric=NORMALMAP
+			;;
+		*)
+			goodmetric=SRGB_MIXED
+			;;
+	esac
+	case "$i" in
+		*_dxt5)
 			fourcc=DXT5
 			nvopts="-bc3 -alpha"
 			;;
+		*_dxt3)
+			fourcc=DXT3
+			nvopts="-bc2 -alpha"
+			;;
 		*)
 			fourcc=DXT1
 			nvopts="-bc1"
@@ -224,15 +236,15 @@ for i in dxtfail floor_tread01 floor_tread01_norm fract001 base_concrete1a disab
 		html "$i"-nvcompress.dds
 	fi
 
-	S2TC_COLORDIST_MODE=SRGB_MIXED S2TC_RANDOM_COLORS=32 S2TC_REFINE_COLORS=CHECK  t "$i".tga "$i"-rand32-mrgb-r.dds bin/s2tc -t $fourcc
-	S2TC_COLORDIST_MODE=WAVG       S2TC_RANDOM_COLORS=32 S2TC_REFINE_COLORS=CHECK  t "$i".tga "$i"-rand32-wavg-r.dds bin/s2tc -t $fourcc
-	S2TC_COLORDIST_MODE=AVG        S2TC_RANDOM_COLORS=32 S2TC_REFINE_COLORS=CHECK  t "$i".tga "$i"-rand32-avg-r.dds  bin/s2tc -t $fourcc
+	S2TC_COLORDIST_MODE=$goodmetric S2TC_RANDOM_COLORS=32 S2TC_REFINE_COLORS=CHECK  t "$i".tga "$i"-rand32-mrgb-r.dds bin/s2tc -t $fourcc
+	S2TC_COLORDIST_MODE=WAVG        S2TC_RANDOM_COLORS=32 S2TC_REFINE_COLORS=CHECK  t "$i".tga "$i"-rand32-wavg-r.dds bin/s2tc -t $fourcc
+	S2TC_COLORDIST_MODE=AVG         S2TC_RANDOM_COLORS=32 S2TC_REFINE_COLORS=CHECK  t "$i".tga "$i"-rand32-avg-r.dds  bin/s2tc -t $fourcc
 	if $use_libtxc_dxtn; then
-		LD_PRELOAD=/usr/lib/libtxc_dxtn.so                                     t "$i".tga "$i"-libtxc_dxtn.dds   bin/s2tc -t $fourcc
+		LD_PRELOAD=/usr/lib/libtxc_dxtn.so                                      t "$i".tga "$i"-libtxc_dxtn.dds   bin/s2tc -t $fourcc
 		unset LD_PRELOAD
 	fi
-	S2TC_COLORDIST_MODE=WAVG       S2TC_RANDOM_COLORS=0  S2TC_REFINE_COLORS=ALWAYS t "$i".tga "$i"-norand-wavg-r.dds bin/s2tc -t $fourcc
-	S2TC_COLORDIST_MODE=WAVG       S2TC_RANDOM_COLORS=-1 S2TC_REFINE_COLORS=ALWAYS t "$i".tga "$i"-faster-wavg-r.dds bin/s2tc -t $fourcc
+	S2TC_COLORDIST_MODE=WAVG        S2TC_RANDOM_COLORS=0  S2TC_REFINE_COLORS=ALWAYS t "$i".tga "$i"-norand-wavg-r.dds bin/s2tc -t $fourcc
+	S2TC_COLORDIST_MODE=WAVG        S2TC_RANDOM_COLORS=-1 S2TC_REFINE_COLORS=ALWAYS t "$i".tga "$i"-faster-wavg-r.dds bin/s2tc -t $fourcc
 
 	html_rowend
 done