i915: Use the color channels to pass along solid sources and masks.

Instead of allocating and utilising the texture samplers for 1x1R
solid sources and masks we can simply use the default diffuse and
specular colour channels and adjust the fragment shader appropriately.
The big advantage is the reduction in size of batches which should give
a good boost to glyph performance, irrespective of the additional boost
from using simpler shaders.

However, the motivating factor behind the switch is that our use of 1x1
textures turns out to be buggy...

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
(cherry picked from commit e581ceb7381e29ecc1a172597d258824f6a1d2d3)

Signed-off-by: Owain G. Ainsworth <oga@openbsd.org>

1 files changed, 5 insertions, 0 deletions

diff --git a/src/i830.h b/src/i830.h
index fc60c0a5..475eb9b2 100644
--- a/src/i830.h
+++ b/src/i830.h
@@ -479,6 +479,10 @@ 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;
+	Bool render_source_is_solid;
+	Bool render_mask_is_solid;
 	Bool needs_render_state_emit;
 
 	/* i830 render accel state */
@@ -486,6 +490,7 @@ typedef struct intel_screen_private {
 	uint32_t cblend, ablend, s8_blendctl;
 
 	/* i915 render accel state */
+	PixmapPtr texture[2];
 	uint32_t mapstate[6];
 	uint32_t samplerstate[6];