[Mesa-stable] cherry-pick commit 5b0d6f5c1bc3f7bd37c6efebf48f80ca6ff3ef87

[Mark Janes]

Please cherry-pick the commit

http://cgit.freedesktop.org/mesa/mesa/commit/?id=5b0d6f5c1bc3f7bd37c6efebf48f80ca6ff3ef87

for the next 10.6 release.  It fixes 6 dEQP
functional.fbo.completeness.renderable.texture tests.

thanks,

Mark