fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 13:28:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

i965/skl: Align compressed textures to four times the block size

Browse source 
On Skylake it is possible to choose your own alignment values for
compressed textures but they are expressed as a multiple of the block
size. The minimum alignment value we can use is 4 so we effectively
have to align to 4 times the block size. This patch makes it initially
set mt->align_[wh] to the large alignment value and then later divides
it by the block size so that it can be uploaded as part of the surface
state.

Reviewed-by: Ben Widawsky <ben@bwidawsk.net>
This commit is contained in:
Neil Roberts 2015-02-19 19:33:43 +00:00
parent b5045e2991
commit 4ab8d59a23
1 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/mesa/drivers/dri/i965/brw_tex_layout.c
View file

@ -73,7 +73,16 @@ intel_horizontal_texture_alignment_unit(struct brw_context *brw,
*/ */
unsigned int i, j; unsigned int i, j;
_mesa_get_format_block_size(mt->format, &i, &j); _mesa_get_format_block_size(mt->format, &i, &j);
return i;
/* On Gen9+ we can pick our own alignment for compressed textures but it
* has to be a multiple of the block size. The minimum alignment we can
* pick is 4 so we effectively have to align to 4 times the block
* size
*/
if (brw->gen >= 9)
return i * 4;
else
return i;
} }
if (mt->format == MESA_FORMAT_S_UINT8) if (mt->format == MESA_FORMAT_S_UINT8)
@ -116,7 +125,8 @@ intel_vertical_texture_alignment_unit(struct brw_context *brw,
* the SURFACE_STATE "Surface Vertical Alignment" field. * the SURFACE_STATE "Surface Vertical Alignment" field.
*/ */
if (_mesa_is_format_compressed(format)) if (_mesa_is_format_compressed(format))
return 4; /* See comment above for the horizontal alignment */
return brw->gen >= 9 ? 16 : 4;
if (format == MESA_FORMAT_S_UINT8) if (format == MESA_FORMAT_S_UINT8)
return brw->gen >= 7 ? 8 : 4; return brw->gen >= 7 ? 8 : 4;
@ -198,6 +208,9 @@ brw_miptree_layout_2d(struct intel_mipmap_tree *mt)
unsigned width = mt->physical_width0; unsigned width = mt->physical_width0;
unsigned height = mt->physical_height0; unsigned height = mt->physical_height0;
unsigned depth = mt->physical_depth0; /* number of array layers. */ unsigned depth = mt->physical_depth0; /* number of array layers. */
unsigned int bw, bh;
_mesa_get_format_block_size(mt->format, &bw, &bh);
mt->total_width = mt->physical_width0; mt->total_width = mt->physical_width0;
@ -215,7 +228,7 @@ brw_miptree_layout_2d(struct intel_mipmap_tree *mt)
if (mt->compressed) { if (mt->compressed) {
mip1_width = ALIGN(minify(mt->physical_width0, 1), mt->align_w) + mip1_width = ALIGN(minify(mt->physical_width0, 1), mt->align_w) +
ALIGN(minify(mt->physical_width0, 2), mt->align_w); ALIGN(minify(mt->physical_width0, 2), bw);
} else { } else {
mip1_width = ALIGN(minify(mt->physical_width0, 1), mt->align_w) + mip1_width = ALIGN(minify(mt->physical_width0, 1), mt->align_w) +
minify(mt->physical_width0, 2); minify(mt->physical_width0, 2);
@ -235,7 +248,7 @@ brw_miptree_layout_2d(struct intel_mipmap_tree *mt)
img_height = ALIGN(height, mt->align_h); img_height = ALIGN(height, mt->align_h);
if (mt->compressed) if (mt->compressed)
img_height /= mt->align_h; img_height /= bh;
if (mt->array_layout == ALL_SLICES_AT_EACH_LOD) { if (mt->array_layout == ALL_SLICES_AT_EACH_LOD) {
/* Compact arrays with separated miplevels */ /* Compact arrays with separated miplevels */
@ -529,5 +542,15 @@ brw_miptree_layout(struct brw_context *brw, struct intel_mipmap_tree *mt)
} }
DBG("%s: %dx%dx%d\n", __func__, DBG("%s: %dx%dx%d\n", __func__,
mt->total_width, mt->total_height, mt->cpp); mt->total_width, mt->total_height, mt->cpp);
/* On Gen9+ the alignment values are expressed in multiples of the block
* size
*/
if (brw->gen >= 9) {
unsigned int i, j;
_mesa_get_format_block_size(mt->format, &i, &j);
mt->align_w /= i;
mt->align_h /= j;
}
} }