X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fcompress-texture;h=9e3b58e5e26719f9d25a33644ba43f58c198cf88;hp=9e8d662b30c50dee9e73f8c3b6e750c941664fba;hb=1a0ff870ff6b234747a81dd669d18d463e802cb9;hpb=3501f1c4f3a19a7fef42535371895afa033a8fb2

diff --git a/misc/tools/compress-texture b/misc/tools/compress-texture
index 9e8d662b..9e3b58e5 100755
--- a/misc/tools/compress-texture
+++ b/misc/tools/compress-texture
@@ -3,13 +3,53 @@
 # usage: compress-texture tool compression in.png out.dds
 # example: compress-texture compressonator dxt1 foo.jpg foo.dds
 
+echo >&2 "$0 $*"
+
 tool=$1; shift
 format=$1; shift
 src=$1; shift
 dst=$1; shift
 
+ext=${src##*.}
+
 c=
 f=
+
+fourcchack=
+case "$tool" in
+	compressonator-dxtc)
+		# we still have to preprocess the image to premultiply alpha, as it seems
+		case "$format" in
+			dxt2)
+				fourcchack=DXT2
+				format=dxt2
+				;;
+			dxt4)
+				fourcchack=DXT4
+				format=dxt4
+				;;
+		esac
+		;;
+	*)
+		case "$format" in
+			dxt2)
+				fourcchack=DXT2
+				format=dxt3
+				;;
+			dxt4)
+				fourcchack=DXT4
+				format=dxt5
+				;;
+		esac
+		;;
+esac
+
+if [ -n "$fourcchack" ]; then
+	fourcchack_dir=`mktemp -d`
+	convert "$src" -fx "u*u.a" -type TrueColorMatte "$fourcchack_dir/src.$ext"
+	src="$fourcchack_dir/src.$ext"
+fi
+
 case "$tool" in
 	compressonator-dxtc|compressonator-atic)
 		case "$tool" in
@@ -18,16 +58,24 @@ case "$tool" in
 		esac
 		case "$format" in
 			dxt1) f="+fourCC DXT1" ;;
+			dxt2) f="+fourCC DXT2" ;;
 			dxt3) f="+fourCC DXT3" ;;
+			dxt4) f="+fourCC DXT4" ;;
 			dxt5) f="+fourCC DXT5" ;;
 		esac
 		dir=`mktemp -d "$HOME/.wine/drive_c/compressonator.XXXXXX"`
 		dir_dos="C:/${dir##*/}"
-		ext=${src##*.}
 		cp "$src" "$dir/src.$ext"
-		wine "$HOME/.wine/drive_c/Program Files/AMD/The Compressonator 1.50/TheCompressonator.exe" -convert -mipmaps "$dir_dos/src.$ext" "$dir_dos/dst.dds" $c $f "$@" -mipper BoxFilter.dll
-		mv "$dir/dst.dds" "$dst"
+
+		# compressonator and wine suck, so we sometimes have to retry :(
+		for retry in 1 2 3 4 5; do
+			wine "c:/Program Files/AMD/The Compressonator 1.50/TheCompressonator.exe" -convert -mipmaps "$dir_dos/src.$ext" "$dir_dos/dst.dds" $c $f "$@" -mipper BoxFilter.dll
+			if mv "$dir/dst.dds" "$dst"; then
+				break
+			fi
+		done
 		rm -rf "$dir"
+		[ -f "$dst" ]
 		;;
 	nvcompress)
 		case "$format" in
@@ -37,4 +85,18 @@ case "$tool" in
 		esac
 		nvcompress $f "$@" "$src" "$dst"
 		;;
+	s2tc)
+		case "$format" in
+			dxt1) f="-t DXT1" ;;
+			dxt3) f="-t DXT3" ;;
+			dxt5) f="-t DXT5" ;;
+		esac
+		s2tc_compress $f "$@" -i "$src" -o "$dst"
+		;;
 esac
+
+if [ -n "$fourcchack" ]; then
+	# use dd to hack in the right FOURCC
+	echo -n "$fourcchack" | dd of="$dst" bs=1 count=4 seek=84 conv=notrunc
+	rm -rf "$fourcchack_dir"
+fi