lib: Don't give a struct igt_buf * to fast_copy_pitch()

So we can use this function in a "raw" (ie without igt_buf) version.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
This commit is contained in:
Damien Lespiau 2015-03-03 14:10:58 +00:00
parent cbd927cd35
commit 130221b3b5

View File

@ -461,12 +461,12 @@ unsigned igt_buf_height(struct igt_buf *buf)
* pitches are in bytes if the surfaces are linear, number of dwords * pitches are in bytes if the surfaces are linear, number of dwords
* otherwise * otherwise
*/ */
static uint32_t fast_copy_pitch(struct igt_buf *buf) static uint32_t fast_copy_pitch(unsigned int stride, enum i915_tiling tiling)
{ {
if (buf->tiling != I915_TILING_NONE) if (tiling != I915_TILING_NONE)
return buf->stride / 4; return stride / 4;
else else
return buf->stride; return stride;
} }
/** /**
@ -494,8 +494,8 @@ void igt_blitter_fast_copy(struct intel_batchbuffer *batch,
uint32_t src_pitch, dst_pitch; uint32_t src_pitch, dst_pitch;
uint32_t dword0 = 0, dword1 = 0; uint32_t dword0 = 0, dword1 = 0;
src_pitch = fast_copy_pitch(src); src_pitch = fast_copy_pitch(src->stride, src->tiling);
dst_pitch = fast_copy_pitch(dst); dst_pitch = fast_copy_pitch(dst->stride, src->tiling);
#define CHECK_RANGE(x) ((x) >= 0 && (x) < (1 << 15)) #define CHECK_RANGE(x) ((x) >= 0 && (x) < (1 << 15))
assert(CHECK_RANGE(src_x) && CHECK_RANGE(src_y) && assert(CHECK_RANGE(src_x) && CHECK_RANGE(src_y) &&