Shader fix
Merge branch 'misc/opengl-upgrade' into misc/abstract-user-interface