text data bss dec hex filename
8852169 388752 671064 9911985 973eb1 lib/i965_dri.so
8852017 388752 671064 9911833 973e19
---
src/mesa/drivers/dri/i965/intel_tiled_memcpy.c | 48 +++++++++-----------------
1 file changed, 16 insertions(+), 32 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/intel_tiled_memcpy.c
b/src/mesa/drivers/dri/i965/intel_tiled_memcpy.c
index 53a5679691..a8157b5232 100644
--- a/src/mesa/drivers/dri/i965/intel_tiled_memcpy.c
+++ b/src/mesa/drivers/dri/i965/intel_tiled_memcpy.c
@@ -468,26 +468,22 @@ linear_to_xtiled_faster(uint32_t x0, uint32_t x1,
uint32_t x2, uint32_t x3,
if (mem_copy == memcpy)
return linear_to_xtiled(0, 0, xtile_width, xtile_width, 0,
xtile_height,
dst, src, src_pitch, swizzle_bit, memcpy,
memcpy);
- else if (mem_copy == rgba8_copy)
+ else /* if (mem_copy == rgba8_copy) */
return linear_to_xtiled(0, 0, xtile_width, xtile_width, 0,
xtile_height,
dst, src, src_pitch, swizzle_bit,
rgba8_copy, rgba8_copy_aligned_dst);
- else
- unreachable("not reached");
} else {
if (mem_copy == memcpy)
return linear_to_xtiled(x0, x1, x2, x3, y0, y1,
dst, src, src_pitch, swizzle_bit,
memcpy, memcpy);
- else if (mem_copy == rgba8_copy)
+ else /* if (mem_copy == rgba8_copy) */
return linear_to_xtiled(x0, x1, x2, x3, y0, y1,
dst, src, src_pitch, swizzle_bit,
rgba8_copy, rgba8_copy_aligned_dst);
- else
- unreachable("not reached");
}
- linear_to_xtiled(x0, x1, x2, x3, y0, y1,
- dst, src, src_pitch, swizzle_bit, mem_copy, mem_copy);
+
+ unreachable("not reached");
}
/**
@@ -511,25 +507,21 @@ linear_to_ytiled_faster(uint32_t x0, uint32_t x1,
uint32_t x2, uint32_t x3,
if (mem_copy == memcpy)
return linear_to_ytiled(0, 0, ytile_width, ytile_width, 0,
ytile_height,
dst, src, src_pitch, swizzle_bit, memcpy,
memcpy);
- else if (mem_copy == rgba8_copy)
+ else /* if (mem_copy == rgba8_copy) */
return linear_to_ytiled(0, 0, ytile_width, ytile_width, 0,
ytile_height,
dst, src, src_pitch, swizzle_bit,
rgba8_copy, rgba8_copy_aligned_dst);
- else
- unreachable("not reached");
} else {
if (mem_copy == memcpy)
return linear_to_ytiled(x0, x1, x2, x3, y0, y1,
dst, src, src_pitch, swizzle_bit, memcpy,
memcpy);
- else if (mem_copy == rgba8_copy)
+ else /* if (mem_copy == rgba8_copy) */
return linear_to_ytiled(x0, x1, x2, x3, y0, y1,
dst, src, src_pitch, swizzle_bit,
rgba8_copy, rgba8_copy_aligned_dst);
- else
- unreachable("not reached");
}
- linear_to_ytiled(x0, x1, x2, x3, y0, y1,
- dst, src, src_pitch, swizzle_bit, mem_copy, mem_copy);
+
+ unreachable("not reached");
}
/**
@@ -553,25 +545,21 @@ xtiled_to_linear_faster(uint32_t x0, uint32_t x1,
uint32_t x2, uint32_t x3,
if (mem_copy == memcpy)
return xtiled_to_linear(0, 0, xtile_width, xtile_width, 0,
xtile_height,
dst, src, dst_pitch, swizzle_bit, memcpy,
memcpy);
- else if (mem_copy == rgba8_copy)
+ else /* if (mem_copy == rgba8_copy) */
return xtiled_to_linear(0, 0, xtile_width, xtile_width, 0,
xtile_height,
dst, src, dst_pitch, swizzle_bit,
rgba8_copy, rgba8_copy_aligned_src);
- else
- unreachable("not reached");
} else {
if (mem_copy == memcpy)
return xtiled_to_linear(x0, x1, x2, x3, y0, y1,
dst, src, dst_pitch, swizzle_bit, memcpy,
memcpy);
- else if (mem_copy == rgba8_copy)
+ else /* if (mem_copy == rgba8_copy) */
return xtiled_to_linear(x0, x1, x2, x3, y0, y1,
dst, src, dst_pitch, swizzle_bit,
rgba8_copy, rgba8_copy_aligned_src);
- else
- unreachable("not reached");
}
- xtiled_to_linear(x0, x1, x2, x3, y0, y1,
- dst, src, dst_pitch, swizzle_bit, mem_copy, mem_copy);
+
+ unreachable("not reached");
}
/**
@@ -595,25 +583,21 @@ ytiled_to_linear_faster(uint32_t x0, uint32_t x1,
uint32_t x2, uint32_t x3,
if (mem_copy == memcpy)
return ytiled_to_linear(0, 0, ytile_width, ytile_width, 0,
ytile_height,
dst, src, dst_pitch, swizzle_bit, memcpy,
memcpy);
- else if (mem_copy == rgba8_copy)
+ else /* if (mem_copy == rgba8_copy) */
return ytiled_to_linear(0, 0, ytile_width, ytile_width, 0,
ytile_height,
dst, src, dst_pitch, swizzle_bit,
rgba8_copy, rgba8_copy_aligned_src);
- else
- unreachable("not reached");
} else {
if (mem_copy == memcpy)
return ytiled_to_linear(x0, x1, x2, x3, y0, y1,
dst, src, dst_pitch, swizzle_bit, memcpy,
memcpy);
- else if (mem_copy == rgba8_copy)
+ else /* if (mem_copy == rgba8_copy) */
return ytiled_to_linear(x0, x1, x2, x3, y0, y1,
dst, src, dst_pitch, swizzle_bit,
rgba8_copy, rgba8_copy_aligned_src);
- else
- unreachable("not reached");
}
- ytiled_to_linear(x0, x1, x2, x3, y0, y1,
- dst, src, dst_pitch, swizzle_bit, mem_copy, mem_copy);
+
+ unreachable("not reached");
}
/**
--
2.16.1
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
