Hi, Patches 3-4, 7 are fixes. Patch 6 is required for 7. Patches 1-2, 5 add new shader info fields that may be useful in the future. I kept them because I don't feel reordering the commits is worth it. Please review. Marek