i915: Derive the correct target color from the pixmap by checking its format

Particularly noting to route alpha to the green channel when blending
with a8 destinations.

Fixes:

  rendercheck/repeat/triangles regressed
  http://bugs.freedesktop.org/show_bug.cgi?id=25047

introduced with commit 14109a.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

1 files changed, 2 insertions, 2 deletions

diff --git a/src/i830.h b/src/i830.h
index bd627437..87b3dba7 100644
--- a/src/i830.h
+++ b/src/i830.h
@@ -259,8 +259,8 @@ typedef struct intel_screen_private {
 
 	PixmapPtr render_source, render_mask, render_dest;
 	PicturePtr render_source_picture, render_mask_picture, render_dest_picture;
-	uint32_t render_source_solid;
-	uint32_t render_mask_solid;
+	CARD32 render_source_solid;
+	CARD32 render_mask_solid;
 	Bool render_source_is_solid;
 	Bool render_mask_is_solid;
 	Bool needs_render_state_emit;