[Mesa-stable] Patches to 13.0 and 17.0

[Pohjolainen, Topi]

Hi Emil,

There would a few already committed patches we'd like to get into 13.0:

e6da6943fed1228c551af1f0e1a405b6d67b41ae
46b346899d98e29943f8cd74c25bcb8d2f868a49

For 17.0 there would be:

4840a53e902b0f2b9841d9dbb90e479a3688153d
e6da6943fed1228c551af1f0e1a405b6d67b41ae
46b346899d98e29943f8cd74c25bcb8d2f868a49
180653c357d19ca88f7895f59874a58fac99cc53


Thanks,
Topi