No, he didn't ... but Baldwin should have been immediately arrested for the THREATS HE MADE... ON CAMERA. Threatening to kill someone IS A CRIME.
That is NOT what 'self defense' is about - and a threat given to guard against imminent physical harm is legal - just not in Texas.

Finally, brethren, whatsoever things are true, whatsoever things are honest, whatsoever things are just, whatsoever things are pure, whatsoever things are lovely, whatsoever things are of good ...