minor refactoring of shaders for more cross compilation assistance.