Fixes for new cogl api
Fixes for new cogl api

The fixes the api breakage caused by the merge of cogl-material branch

jonnylamb/mx,pwithnall/mx,pwithnall/mx,clutter-project/mx,jonnylamb/mx,clutter-project/mx,pwithnall/mx,clutter-project/mx,jonnylamb/mx,pwithnall/mx,clutter-project/mx,jonnylamb/mx