shader audit script fixes (don't report same shader twice)

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

diff --git a/scripts/shader-audit.sh b/scripts/shader-audit.sh
index 4a0bb3710c52f81b473653e1592420f1cf1359f8..ccb5f64bb4257005e36539537c61ef74a320f93c 100755 (executable)
--- a/scripts/shader-audit.sh
+++ b/scripts/shader-audit.sh
@@ -89,13 +89,13 @@ use_texture()
 
        if [ x"$3" = x"map" ]; then
                lasttex=$2
-               if [ -n "$AUDIT_ALPHACHANNELS" ]; then
-                       if [ -f "../${2}_norm.tga" ]; then
+               if [ -n "$AUDIT_ALPHACHANNELS" ] && [ x"$offsetmapping_match8" != x"firststagedone" ]; 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"
                                                if [ "$min" -eq "$max" ]; then
-                                                       echo "(EE) shader $1 uses broken normalmap ${2}_norm.tga (add dpoffsetmapping none)"; seterror
+                                                       echo "(WW) shader $1 uses broken normalmap ${2}_norm.tga (add dpoffsetmapping none)"
                                                else
                                                        echo "(EE) shader $1 uses ${2}_norm.tga but lacks median (add dpoffsetmapping - 1 match8 $median)"; seterror
                                                fi
@@ -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')
@@ -288,6 +292,7 @@ parse_shaderstage()
                                        *)
                                                use_texture "$parsing_shader" "`normalize "$A1"`" map
                                                ss_map="`normalize "$A1"`"
+                                               offsetmapping_match8=firststagedone
                                                ;;
                                esac
                                ;;
@@ -316,29 +321,37 @@ 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
+                                                               ;;
+                                                       *)
+                                                               # alphagen is set, but blendfunc has no use for it
+                                                               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
                                ;;