sync latest fix from desktop gl
fix parameterization to get rid of warnings