also include alphagen

[xonotic/xonotic-maps.pk3dir.git] / scripts / shader-audit.sh

diff --git a/scripts/shader-audit.sh b/scripts/shader-audit.sh
index c006707e14708fb77df43e59fa7d934de543702d..75e7e2825e4a2b16b1984b5a088f8e55d6284746 100755 (executable)
--- a/scripts/shader-audit.sh
+++ b/scripts/shader-audit.sh
@@ -27,7 +27,7 @@ forbidden_prefixes=
 
 getstats_e()
 {
-       identify -verbose -alpha extract -depth 8 "$1" | {
+       identify -verbose -depth 8 -alpha set -alpha extract "$1" | {
                pix=0
                while read -r L V R; do
                        case "$L" in
@@ -90,7 +90,7 @@ use_texture()
        if [ x"$3" = x"map" ]; then
                lasttex=$2
                if [ -n "$AUDIT_ALPHACHANNELS" ]; then
-                       if [ -f "../${2}_norm.tga" ]; then
+                       if [ -f "../${2}_norm.tga" ] || [ -f "../${2}_norm.png" ] || [ -f "../${2}_norm.jpg" ]; then
                                case "$offsetmapping_match8" in
                                        '') # no dpoffsetmapping keyword
                                                getstats "../${2}_norm.tga" || getstats "../${2}_norm.png" || getstats "../${2}_norm.jpg"
@@ -272,6 +272,7 @@ parse_shaderstage()
 {
        ss_blendfunc=none
        ss_alphafunc=none
+       ss_alphagen=none
        ss_map=
        while read L A1 Aother; do
                case "`echo "$L" | tr A-Z a-z`" in
@@ -281,6 +282,9 @@ parse_shaderstage()
                        alphafunc)
                                ss_alphafunc=`echo $A1 | tr A-Z a-z`
                                ;;
+                       alphagen)
+                               ss_alphagen=`echo $A1 | tr A-Z a-z`
+                               ;;
                        map|clampmap)
                                case "$A1" in
                                        '$lightmap')
@@ -316,29 +320,36 @@ parse_shaderstage()
                case "$ss_blendfunc" in
                        *src_alpha*|*blend*)
                                # texture must have alpha
-                               if [ $min -eq 255 ]; then
-                                       echo "(EE) $parsing_shader uses alpha-less texture $ss_map with blendfunc $ss_blendfunc"; seterror
+                               if [ x"$ss_alphagen" = x"none" -a $min -eq 255 ]; then
+                                       echo "(EE) $parsing_shader uses alpha-less texture $ss_map with blendfunc $ss_blendfunc and alphagen $ss_alphagen"; seterror
                                fi
                                ;;
                        add|"gl_one gl_one")
                                # texture must not have alpha (engine bug)
-                               if [ $min -lt 255 ]; then
-                                       echo "(EE) $parsing_shader uses alpha-using texture $ss_map with blendfunc $ss_blendfunc"; seterror
+                               if [ x"$ss_alphagen" != x"none" -o $min -lt 255 ]; then
+                                       echo "(EE) $parsing_shader uses alpha-using texture $ss_map with blendfunc $ss_blendfunc and alphagen $ss_alphagen"; seterror
                                fi
                                ;;
                        *)
                                case "$ss_alphafunc" in
                                        g*)
                                                # texture must have alpha
-                                               if [ $min -eq 255 ]; then
-                                                       echo "(EE) $parsing_shader uses alpha-less texture $ss_map with alphafunc $ss_alphafunc"; seterror
+                                               if [ x"$ss_alphagen" = x"none" -a $min -eq 255 ]; then
+                                                       echo "(EE) $parsing_shader uses alpha-less texture $ss_map with alphafunc $ss_alphafunc and alphagen $ss_alphagen"; seterror
                                                fi
                                                ;;
                                        *)
                                                # texture should not have alpha (no bug if not)
-                                               if [ $min -lt 255 ]; then
-                                                       echo "(WW) $parsing_shader uses alpha-using texture $ss_map with blendfunc $ss_blendfunc and alphafunc $ss_alphafunc"
-                                               fi
+                                               case "$ss_alphagen" in
+                                                       none)
+                                                               if [ $min -lt 255 ]; then
+                                                                       echo "(WW) $parsing_shader uses alpha-using texture $ss_map with blendfunc $ss_blendfunc and alphafunc $ss_alphafunc and alphagen $ss_alphagen"
+                                                               fi
+                                                               ;;
+                                                       *)
+                                                               echo "(EE) $parsing_shader uses alpha-using texture $ss_map with blendfunc $ss_blendfunc and alphafunc $ss_alphafunc and alphagen $ss_alphagen"; seterror
+                                                               ;;
+                                               esac
                                                ;;
                                esac
                                ;;