Minor reorganization of shader validation code

Minor reorganization of shader validation code #2546