xf86-video-intel: src/i915_render.c

[Chris Wilson]

 src/i915_render.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 31d5f84bb4416ef92abd97264d52cdab7a184687
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Mar 17 09:11:05 2010 +0000

    i915: Correct preamble for emit_composite
    
    Fixes:
    http://bugs.freedesktop.org/show_bug.cgi?id=27123
    
    Fatal server error:
    i915_emit_composite_setup: ADVANCE_BATCH: under-used allocation 100/104
    
    Introduced with commit d6b7f96fde1add92fd11f5a75869ae6fc688bf77.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/i915_render.c b/src/i915_render.c
index c4aa9a4..819b963 100644
--- a/src/i915_render.c
+++ b/src/i915_render.c
@@ -504,7 +504,7 @@ static void i915_emit_composite_setup(ScrnInfoPtr scrn)
 	tex_count += ! is_solid_src;
 	tex_count += mask && ! is_solid_mask;
 
-	t = 16;
+	t = 15;
 	if (tex_count)
 	    t += 6 * tex_count + 4;
 	if (is_solid_src)