Thanks I'd been meaning to look into this, this is much better. Series is: Reviewed-by: Timothy Arceri <timothy.arcero at collabora.com> It would be great if you could push this soon so I can rebase my shader cache work on top of it :)