From cc5f26448eb348ea72ea94ecfeacbe472c92f850 Mon Sep 17 00:00:00 2001
From: Rudolf Polzer <divverent@xonotic.org>
Date: Thu, 14 Jan 2016 03:47:34 +0100
Subject: [PATCH] minor fixes
---
scripts/shader-audit.sh | 5 +++--
scripts/shader-parser.subr | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/scripts/shader-audit.sh b/scripts/shader-audit.sh
index c583f0ee..8aab433e 100755
--- a/scripts/shader-audit.sh
+++ b/scripts/shader-audit.sh
@@ -342,17 +342,18 @@ parse_shaderstage_post()
mainalphagen=$ss_alphagen
elif [ x"$ss_alphagen" = x"vertex" ] && ! $textureblending; then
case "$mainblendfunc:$mainalphafunc:$ss_blendfunc:$ss_alphafunc" in
+ # TODO check against dp
none:none:"gl_src_alpha gl_one_minus_src_alpha":none) textureblending=true ;;
none:none:filter:none) textureblending=true ;;
none:none:none:g*) textureblending=true ;;
"gl_one gl_zero":none:filter:none) textureblending=true ;;
"gl_one gl_zero":none:none:g*) textureblending=true ;;
*)
- err "texture blending requires first stage to have no blendfunc/alphatest, and requires second stage to be blendfunc filter"
+ err "$parsing_shader uses texture blending, but that requires first stage to have no blendfunc/alphatest, and requires second stage to be blendfunc filter"
;;
esac
else
- err "multistage shader without alphagen vertex, or using more than 2 stages, is not supported by DarkPlaces"
+ err "$parsing_shader, a multistage shader without alphagen vertex, or using more than 2 stages, is not supported by DarkPlaces"
fi
fi
}
diff --git a/scripts/shader-parser.subr b/scripts/shader-parser.subr
index ef82832f..5f18cec8 100644
--- a/scripts/shader-parser.subr
+++ b/scripts/shader-parser.subr
@@ -4,7 +4,7 @@
shader_normalize()
{
- echo "$1" | sed 's/\.\(tga\|jpg\|png\)$//'
+ echo "$1" | sed 's/^"//; s/"$//; s/\.\(tga\|jpg\|png\)$//'
}
parse_shaderstage_pre()
--
2.39.5