Amarillo, Texas - A man shot by police at the Sorority House nightclub has been charged with two counts of aggravated assault against a peace officer with a deadly weapon.