r2: changed the glsl source to use preprocessing
merged master