Some changes should have been conditional, i.e. added back in for
OpenGL legacy.

Change-Id: I8f4e02fc1267593613b7d5080a57e86d2309f6a2