This makes simple (i.e., not implemented as a shader) OpenGL transitions
work correctly again.

Change-Id: I773f686089bce3611940743b1a7f5046093886e8