Include augment shader defines in shader cache key
AddDefine defines were missing from the shader cache key, causing a
pipeline compiled without a define to be reused when the define was
later added. Fix this by appending defines to materialInfoString and
shaderString. Also append the augment preamble and body to shaderString
so different augment shaders produce distinct cache entries.
Pick-to: 6.11
Change-Id: Icab9add4625b92f1aaa0d1daf6c20e02807170ba
Reviewed-by: Christian Strømme <christian.stromme@qt.io>