Commit eb56e649 authored by Keith Whitwell's avatar Keith Whitwell

Merge commit 'origin/master' into gallium-resources

Conflicts:
	src/gallium/drivers/r300/r300_texture.c
parents f8b0a7f6 e7f1e5ca
......@@ -695,6 +695,9 @@ static unsigned r300_texture_get_nblocksy(struct r300_texture* tex,
tile_height = r300_texture_get_tile_size(tex, TILE_HEIGHT,
tex->mip_macrotile[level]);
height = align(height, tile_height);
/* This is needed for the kernel checker, unfortunately. */
height = util_next_power_of_two(height);
}
return util_format_get_nblocksy(tex->b.b.format, height);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment