fixup! i965/gen7+: Ensure that color buffers are resolved before texturing.
squash! i965/gen7+: Ensure that color buffers are resolved before texturing.

Also before mapping.