diff options
| author | Peter Clifton <pcjc2@cam.ac.uk> | 2010-11-09 22:00:36 +0000 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-11-09 14:35:28 -0800 |
| commit | efb0417040f4bdd55cf07dd8f54ecd4fc92c1286 (patch) | |
| tree | 82e9d80fb2ab5d36611b8988f2c8f37c121a439d | |
| parent | 00391c79416ffd4b6f3af0ad911b7b8210f746d1 (diff) | |
intel: Add assert check for blitting alignment.
Also fixup code comment to reflect that the GPU requires DWORD
alignment, but in this case does not actually pass the value "in
DWORDs" as I previously stated.
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_blit.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_blit.c b/src/mesa/drivers/dri/intel/intel_blit.c index 7118898830..c2917e9b07 100644 --- a/src/mesa/drivers/dri/intel/intel_blit.c +++ b/src/mesa/drivers/dri/intel/intel_blit.c @@ -483,8 +483,8 @@ intel_emit_linear_blit(struct intel_context *intel, /* Blits are in a different ringbuffer so we don't use them. */ assert(intel->gen < 6); - /* The pitch hits the GPU as a is a signed value, IN DWORDs. - * But we want width to match pitch. Max width is (1 << 15 - 1), + /* The pitch given to the GPU must be DWORD aligned, and + * we want width to match pitch. Max width is (1 << 15 - 1), * rounding that down to the nearest DWORD is 1 << 15 - 4 */ pitch = MIN2(size, (1 << 15) - 4); @@ -502,6 +502,7 @@ intel_emit_linear_blit(struct intel_context *intel, dst_offset += pitch * height; size -= pitch * height; assert (size < (1 << 15)); + assert ((size & 3) == 0); /* Pitch must be DWORD aligned */ if (size != 0) { ok = intelEmitCopyBlit(intel, 1, size, src_bo, src_offset, I915_TILING_NONE, |