diff options
| author | Jason Ekstrand <jason.ekstrand@intel.com> | 2015-01-28 03:30:32 -0800 |
|---|---|---|
| committer | Jason Ekstrand <jason.ekstrand@intel.com> | 2015-01-30 18:56:56 -0800 |
| commit | 837a4c42a6068d73e80055f6d9657358fb95068b (patch) | |
| tree | 31d62bf6548a1e6a0a39a22abb3267c76f8e06d7 /src/mesa/drivers/dri/i965/intel_tiled_memcpy.c | |
| parent | 7cc3bb2318aa22ba1e85505ff50706bdacdbbf92 (diff) | |
| download | external_mesa3d-837a4c42a6068d73e80055f6d9657358fb95068b.zip external_mesa3d-837a4c42a6068d73e80055f6d9657358fb95068b.tar.gz external_mesa3d-837a4c42a6068d73e80055f6d9657358fb95068b.tar.bz2 | |
i965/tiled_memcpy: Support a signed linear pitch
Reviewed-by: Chad Versace <chad.versace@intel.com>
Diffstat (limited to 'src/mesa/drivers/dri/i965/intel_tiled_memcpy.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_tiled_memcpy.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_tiled_memcpy.c b/src/mesa/drivers/dri/i965/intel_tiled_memcpy.c index 284374f..f2b35cb 100644 --- a/src/mesa/drivers/dri/i965/intel_tiled_memcpy.c +++ b/src/mesa/drivers/dri/i965/intel_tiled_memcpy.c @@ -127,7 +127,7 @@ rgba8_copy(void *dst, const void *src, size_t bytes) typedef void (*tile_copy_fn)(uint32_t x0, uint32_t x1, uint32_t x2, uint32_t x3, uint32_t y0, uint32_t y1, char *dst, const char *src, - uint32_t src_pitch, + int32_t linear_pitch, uint32_t swizzle_bit, mem_copy_fn mem_copy); @@ -140,7 +140,7 @@ static inline void linear_to_xtiled(uint32_t x0, uint32_t x1, uint32_t x2, uint32_t x3, uint32_t y0, uint32_t y1, char *dst, const char *src, - uint32_t src_pitch, + int32_t src_pitch, uint32_t swizzle_bit, mem_copy_fn mem_copy) { @@ -149,7 +149,7 @@ linear_to_xtiled(uint32_t x0, uint32_t x1, uint32_t x2, uint32_t x3, */ uint32_t xo, yo; - src += y0 * src_pitch; + src += (ptrdiff_t)y0 * src_pitch; for (yo = y0 * xtile_width; yo < y1 * xtile_width; yo += xtile_width) { /* Bits 9 and 10 of the copy destination offset control swizzling. @@ -181,7 +181,7 @@ static inline void linear_to_ytiled(uint32_t x0, uint32_t x1, uint32_t x2, uint32_t x3, uint32_t y0, uint32_t y1, char *dst, const char *src, - uint32_t src_pitch, + int32_t src_pitch, uint32_t swizzle_bit, mem_copy_fn mem_copy) { @@ -210,7 +210,7 @@ linear_to_ytiled(uint32_t x0, uint32_t x1, uint32_t x2, uint32_t x3, uint32_t x, yo; - src += y0 * src_pitch; + src += (ptrdiff_t)y0 * src_pitch; for (yo = y0 * column_width; yo < y1 * column_width; yo += column_width) { uint32_t xo = xo1; @@ -242,7 +242,7 @@ static inline void xtiled_to_linear(uint32_t x0, uint32_t x1, uint32_t x2, uint32_t x3, uint32_t y0, uint32_t y1, char *dst, const char *src, - uint32_t dst_pitch, + int32_t dst_pitch, uint32_t swizzle_bit, mem_copy_fn mem_copy) { @@ -251,7 +251,7 @@ xtiled_to_linear(uint32_t x0, uint32_t x1, uint32_t x2, uint32_t x3, */ uint32_t xo, yo; - dst += y0 * dst_pitch; + dst += (ptrdiff_t)y0 * dst_pitch; for (yo = y0 * xtile_width; yo < y1 * xtile_width; yo += xtile_width) { /* Bits 9 and 10 of the copy destination offset control swizzling. @@ -283,7 +283,7 @@ static inline void ytiled_to_linear(uint32_t x0, uint32_t x1, uint32_t x2, uint32_t x3, uint32_t y0, uint32_t y1, char *dst, const char *src, - uint32_t dst_pitch, + int32_t dst_pitch, uint32_t swizzle_bit, mem_copy_fn mem_copy) { @@ -312,7 +312,7 @@ ytiled_to_linear(uint32_t x0, uint32_t x1, uint32_t x2, uint32_t x3, uint32_t x, yo; - dst += y0 * dst_pitch; + dst += (ptrdiff_t)y0 * dst_pitch; for (yo = y0 * column_width; yo < y1 * column_width; yo += column_width) { uint32_t xo = xo1; @@ -349,7 +349,7 @@ static FLATTEN void linear_to_xtiled_faster(uint32_t x0, uint32_t x1, uint32_t x2, uint32_t x3, uint32_t y0, uint32_t y1, char *dst, const char *src, - uint32_t src_pitch, + int32_t src_pitch, uint32_t swizzle_bit, mem_copy_fn mem_copy) { @@ -385,7 +385,7 @@ static FLATTEN void linear_to_ytiled_faster(uint32_t x0, uint32_t x1, uint32_t x2, uint32_t x3, uint32_t y0, uint32_t y1, char *dst, const char *src, - uint32_t src_pitch, + int32_t src_pitch, uint32_t swizzle_bit, mem_copy_fn mem_copy) { @@ -421,7 +421,7 @@ static FLATTEN void xtiled_to_linear_faster(uint32_t x0, uint32_t x1, uint32_t x2, uint32_t x3, uint32_t y0, uint32_t y1, char *dst, const char *src, - uint32_t dst_pitch, + int32_t dst_pitch, uint32_t swizzle_bit, mem_copy_fn mem_copy) { @@ -457,7 +457,7 @@ static FLATTEN void ytiled_to_linear_faster(uint32_t x0, uint32_t x1, uint32_t x2, uint32_t x3, uint32_t y0, uint32_t y1, char *dst, const char *src, - uint32_t dst_pitch, + int32_t dst_pitch, uint32_t swizzle_bit, mem_copy_fn mem_copy) { @@ -495,7 +495,7 @@ void linear_to_tiled(uint32_t xt1, uint32_t xt2, uint32_t yt1, uint32_t yt2, char *dst, const char *src, - uint32_t dst_pitch, uint32_t src_pitch, + uint32_t dst_pitch, int32_t src_pitch, bool has_swizzling, uint32_t tiling, mem_copy_fn mem_copy) @@ -586,7 +586,7 @@ void tiled_to_linear(uint32_t xt1, uint32_t xt2, uint32_t yt1, uint32_t yt2, char *dst, const char *src, - uint32_t dst_pitch, uint32_t src_pitch, + int32_t dst_pitch, uint32_t src_pitch, bool has_swizzling, uint32_t tiling, mem_copy_fn mem_copy) |