fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-19 14:30:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

i965: Move conversion of {src, dst}_pitch to dwords outside if/else

Browse source 
Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Chad Versace <chad.versace@intel.com>
This commit is contained in:
Anuj Phogat 2015-08-11 16:30:34 -07:00
parent 485285498f
commit e83b07aa7b
1 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/mesa/drivers/dri/i965/intel_blit.c
View file

@ -587,15 +587,6 @@ intelEmitCopyBlit(struct brw_context *brw,
dst_tiling, dst_tr_mode,
cpp, use_fast_copy_blit);
/* For tiled source and destination, pitch value should be specified
* as a number of Dwords.
*/
if (dst_tiling != I915_TILING_NONE)
dst_pitch /= 4;
if (src_tiling != I915_TILING_NONE)
src_pitch /= 4;
} else {
assert(!dst_y_tiled || (dst_pitch % 128) == 0);
assert(!src_y_tiled || (src_pitch % 128) == 0);
@ -636,17 +627,19 @@ intelEmitCopyBlit(struct brw_context *brw,
CMD = xy_blit_cmd(src_tiling, src_tr_mode,
dst_tiling, dst_tr_mode,
cpp, use_fast_copy_blit);
if (dst_tiling != I915_TILING_NONE)
dst_pitch /= 4;
if (src_tiling != I915_TILING_NONE)
src_pitch /= 4;
}
if (dst_y2 <= dst_y || dst_x2 <= dst_x) {
/* For tiled source and destination, pitch value should be specified
* as a number of Dwords.
*/
if (dst_tiling != I915_TILING_NONE)
dst_pitch /= 4;
if (src_tiling != I915_TILING_NONE)
src_pitch /= 4;
if (dst_y2 <= dst_y || dst_x2 <= dst_x)
return true;
}
assert(dst_x < dst_x2);
assert(dst_y < dst_y2);