X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=misc%2Ftools%2Fcompress-texture;h=0cafa5a2ea815e19dbf1f597e26517b743e39a87;hb=5255097259873540b4f0a6c88b7d16b138534198;hp=d1ceecd0ec1f7d308d99d41ca343343c6d07315d;hpb=0e1fbbc2bf03b525cefeb1dbd78deaa458c354b6;p=xonotic%2Fxonotic.git

diff --git a/misc/tools/compress-texture b/misc/tools/compress-texture
index d1ceecd0..0cafa5a2 100755
--- a/misc/tools/compress-texture
+++ b/misc/tools/compress-texture
@@ -8,20 +8,24 @@ format=$1; shift
 src=$1; shift
 dst=$1; shift
 
+c=
 f=
 case "$tool" in
-	compressonator)
+	compressonator-dxtc|compressonator-atic)
+		case "$tool" in
+			*-dxtc) c="-codec DXTC.dll" ;;
+			*-atic) c="-codec ATICompressor.dll" ;;
+		esac
 		case "$format" in
 			dxt1) f="+fourCC DXT1" ;;
 			dxt3) f="+fourCC DXT3" ;;
 			dxt5) f="+fourCC DXT5" ;;
 		esac
-		echo ">> $f ($format)"
 		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" -codec DXTC.dll $f "$@"
+		DISPLAY= 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"
 		rm -rf "$dir"
 		;;