!UPSTREAM: Bug fix: resolve color buffer when a blit is used for glBitmap().

TODO:

- De-hackify by renaming intel_drawbuf_region to clarify that it's
  getting the region for purposes of blitting to the draw buffer.

- Fold into an earlier patch.