xf86-video-intel: 3 commits - src/i830_batchbuffer.h src/i965_render.c

[Chris Wilson]

 src/i830_batchbuffer.h |    2 +-
 src/i965_render.c      |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 093bb9ebe69760975a3fcf2322db950312e6c2d7
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Dec 8 23:45:28 2009 +0000

    i965: Only use the affine kernels if both src and mask are affine
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/i965_render.c b/src/i965_render.c
index e79ac04..066901c 100644
--- a/src/i965_render.c
+++ b/src/i965_render.c
@@ -1589,7 +1589,7 @@ i965_prepare_composite(int op, PicturePtr source_picture,
 		intel->transform[1] = mask_picture->transform;
 		intel->scale_units[1][0] = mask->drawable.width;
 		intel->scale_units[1][1] = mask->drawable.height;
-		composite_op->is_affine |=
+		composite_op->is_affine &=
 		    i830_transform_is_affine(intel->transform[1]);
 	}
 
commit 0cf04ea4d736f7d7848f33b772d88a0f1b6678b1
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Dec 8 23:44:45 2009 +0000

    i965: Set src_filter before testing.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/i965_render.c b/src/i965_render.c
index 10ed561..e79ac04 100644
--- a/src/i965_render.c
+++ b/src/i965_render.c
@@ -1469,6 +1469,8 @@ i965_prepare_composite(int op, PicturePtr source_picture,
 	uint32_t *binding_table;
 	drm_intel_bo *binding_table_bo, *surface_state_bo;
 
+	composite_op->src_filter =
+	    sampler_state_filter_from_picture(source_picture->filter);
 	if (composite_op->src_filter < 0) {
 		intel_debug_fallback(scrn, "Bad src filter 0x%x\n",
 				     source_picture->filter);
@@ -1572,8 +1574,6 @@ i965_prepare_composite(int op, PicturePtr source_picture,
 	intel->render_dest = dest;
 	drm_intel_bo_unreference(composite_op->binding_table_bo);
 	composite_op->binding_table_bo = binding_table_bo;
-	composite_op->src_filter =
-	    sampler_state_filter_from_picture(source_picture->filter);
 
 	intel->scale_units[0][0] = source->drawable.width;
 	intel->scale_units[0][1] = source->drawable.height;
commit 417ad2712edcbca635eb5eeff0d11cdb16c069ed
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Dec 8 23:43:57 2009 +0000

    Assert that we only call OUT_BATCH() inside a BATCH
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/i830_batchbuffer.h b/src/i830_batchbuffer.h
index 16c33ef..1beba4f 100644
--- a/src/i830_batchbuffer.h
+++ b/src/i830_batchbuffer.h
@@ -75,7 +75,7 @@ static inline void intel_batch_end_atomic(ScrnInfoPtr scrn)
 static inline void intel_batch_emit_dword(intel_screen_private *intel, uint32_t dword)
 {
 	assert(intel->batch_ptr != NULL);
-	assert(intel_batch_space(intel) >= 4);
+	assert(intel->batch_emitting);
 	*(uint32_t *) (intel->batch_ptr + intel->batch_used) = dword;
 	intel->batch_used += 4;
 }