Merge branch 'glsl-pp-rework-2'