Some shader fixes.
Merge branch 'master' into autoconfiscate
don't qualify void return
Merge branch 'master' into autoconfiscate