Funny thing is I annotated this dependency in e5f63c403b, but didn't actually use it. (cherry picked from master, commit 03187571b6) Conflicts: src/mesa/main/state.c
e5f63c403b
03187571b6