am 877323dd: Refactor ShaderLibrary

* commit '877323dd00656b1045e89b4cc27d2e3ab9ecac2c':
  Refactor ShaderLibrary