Merge "use std factory for compose-shader" into nyc-dev