Enable/Disable client state is only for gles 1 so moved them out of GLES 2 code path.