am 110bc6a5: am 2eaefe19: Simplify handling of opaque layers in shader generation

* commit '110bc6a50fb0c06053bef83afe5075f7e25c5093':
  Simplify handling of opaque layers in shader generation