r2: move glsl usage to macros, for future debug needs
r2: refactor continues
Merge branch 'master' of github.com:etlegacy/etlegacy