[Mesa-dev] [PATCH 2/6] i965/skl: Layout a 1D miptree horizontally
On Gen9+ the 1D miptree is laid out with all of the mipmap levels in a
horizontal line.
---
src/mesa/drivers/dri/i965/brw_tex_layout.c | 62 +-
1 file changed, 60 insertions(+), 2 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_tex_layout.c
b/src/mesa/drivers/dri/i965/brw_tex_layout.c
index 57922e9..851742b 100644
--- a/src/mesa/drivers/dri/i965/brw_tex_layout.c
+++ b/src/mesa/drivers/dri/i965/brw_tex_layout.c
@@ -158,6 +158,36 @@ intel_vertical_texture_alignment_unit(struct brw_context
*brw,
}
static void
+gen9_miptree_layout_1d(struct intel_mipmap_tree *mt)
+{
+ unsigned x = 0;
+ unsigned width = mt->physical_width0;
+ unsigned depth = mt->physical_depth0; /* number of array layers. */
+
+ /* When this layout is used the horizontal alignment is fixed at 64 and the
+* hardware ignores the value given in the surface state
+*/
+ const unsigned int align_w = 64;
+
+ mt->total_height = mt->physical_height0;
+ mt->total_width = 0;
+
+ for (unsigned level = mt->first_level; level <= mt->last_level; level++) {
+ unsigned img_width;
+
+ intel_miptree_set_level_info(mt, level, x, 0, depth);
+
+ img_width = ALIGN(width, align_w);
+
+ mt->total_width = MAX2(mt->total_width, x + img_width);
+
+ x += img_width;
+
+ width = minify(width, 1);
+ }
+}
+
+static void
brw_miptree_layout_2d(struct intel_mipmap_tree *mt)
{
unsigned x = 0;
@@ -242,12 +272,34 @@ align_cube(struct intel_mipmap_tree *mt)
mt->total_height += 2;
}
+static bool
+use_linear_1d_layout(struct brw_context *brw,
+ struct intel_mipmap_tree *mt)
+{
+ /* On Gen9+ the mipmap levels of a 1D surface are all laid out in a
+* horizontal line. This isn't done for depth/stencil buffers however
+* because those will be using a tiled layout
+*/
+ if (brw->gen >= 9 &&
+ (mt->target == GL_TEXTURE_1D ||
+mt->target == GL_TEXTURE_1D_ARRAY)) {
+ GLenum base_format = _mesa_get_format_base_format(mt->format);
+
+ if (base_format != GL_DEPTH_COMPONENT &&
+ base_format != GL_DEPTH_STENCIL)
+ return true;
+ }
+
+ return false;
+}
+
static void
brw_miptree_layout_texture_array(struct brw_context *brw,
struct intel_mipmap_tree *mt)
{
int h0, h1;
unsigned height = mt->physical_height0;
+ bool layout_1d = use_linear_1d_layout(brw, mt);
h0 = ALIGN(mt->physical_height0, mt->align_h);
h1 = ALIGN(minify(mt->physical_height0, 1), mt->align_h);
@@ -258,7 +310,10 @@ brw_miptree_layout_texture_array(struct brw_context *brw,
int physical_qpitch = mt->compressed ? mt->qpitch / 4 : mt->qpitch;
- brw_miptree_layout_2d(mt);
+ if (layout_1d)
+ gen9_miptree_layout_1d(mt);
+ else
+ brw_miptree_layout_2d(mt);
for (unsigned level = mt->first_level; level <= mt->last_level; level++) {
unsigned img_height;
@@ -392,7 +447,10 @@ brw_miptree_layout(struct brw_context *brw, struct
intel_mipmap_tree *mt)
break;
case INTEL_MSAA_LAYOUT_NONE:
case INTEL_MSAA_LAYOUT_IMS:
- brw_miptree_layout_2d(mt);
+ if (use_linear_1d_layout(brw, mt))
+gen9_miptree_layout_1d(mt);
+ else
+brw_miptree_layout_2d(mt);
break;
}
break;
--
1.9.3
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 2/6] i965/skl: Layout a 1D miptree horizontally
Ben Widawsky writes:
> Okay, I'm guilty of a bikeshed here, but doesn't this look cleaner if you just
> do two for loops? One for depth, and one for levels.
>
> something like...
> const unsigned depth = mt->physical_depth0;
> for (i = 0; i < depth; i++) {
> width = mt->physical_width0;
> for (unsigned level = mt->first_level; level <= mt->last_level;
> level++) {
> intel_miptree_set_level_info(mt, level, x, 0, depth);
> mt->total_width += ALIGN(width, 64);
> width = minify(width, 1);
> }
> }
I'm not sure what you mean. This function is just laying out a single
array slice so the depth isn't iterated. The other array slices are laid
out in brw_miptree_layout_texture_array by copying the offsets that this
function generates. It is done the same way for 2D textures.
It might look a bit confusing because the last three parameters of
intel_miptree_set_level_info look like x-offset, y-offset and z-offset
but it's actually x-offset, y-offset and depth of the entire level. The
depth is the same for each level.
I guess I could comment the arguments but the same problem exists in
brw_miptree_layout_2d.
Regards,
- Neil
pgpSYPbhBmvkc.pgp
Description: PGP signature
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 2/6] i965/skl: Layout a 1D miptree horizontally
On Fri, Feb 20, 2015 at 2:31 PM, Neil Roberts wrote:
> On Gen9+ the 1D miptree is laid out with all of the mipmap levels in a
> horizontal line.
> ---
> src/mesa/drivers/dri/i965/brw_tex_layout.c | 62
> +-
> 1 file changed, 60 insertions(+), 2 deletions(-)
>
> diff --git a/src/mesa/drivers/dri/i965/brw_tex_layout.c
> b/src/mesa/drivers/dri/i965/brw_tex_layout.c
> index 57922e9..851742b 100644
> --- a/src/mesa/drivers/dri/i965/brw_tex_layout.c
> +++ b/src/mesa/drivers/dri/i965/brw_tex_layout.c
> @@ -158,6 +158,36 @@ intel_vertical_texture_alignment_unit(struct brw_context
> *brw,
> }
>
> static void
> +gen9_miptree_layout_1d(struct intel_mipmap_tree *mt)
> +{
> + unsigned x = 0;
> + unsigned width = mt->physical_width0;
> + unsigned depth = mt->physical_depth0; /* number of array layers. */
> +
> + /* When this layout is used the horizontal alignment is fixed at 64 and
> the
> +* hardware ignores the value given in the surface state
> +*/
> + const unsigned int align_w = 64;
> +
> + mt->total_height = mt->physical_height0;
> + mt->total_width = 0;
> +
> + for (unsigned level = mt->first_level; level <= mt->last_level; level++) {
> + unsigned img_width;
> +
> + intel_miptree_set_level_info(mt, level, x, 0, depth);
> +
> + img_width = ALIGN(width, align_w);
> +
> + mt->total_width = MAX2(mt->total_width, x + img_width);
> +
> + x += img_width;
> +
> + width = minify(width, 1);
> + }
> +}
> +
> +static void
> brw_miptree_layout_2d(struct intel_mipmap_tree *mt)
> {
> unsigned x = 0;
> @@ -242,12 +272,34 @@ align_cube(struct intel_mipmap_tree *mt)
>mt->total_height += 2;
> }
>
> +static bool
> +use_linear_1d_layout(struct brw_context *brw,
> + struct intel_mipmap_tree *mt)
> +{
> + /* On Gen9+ the mipmap levels of a 1D surface are all laid out in a
> +* horizontal line. This isn't done for depth/stencil buffers however
> +* because those will be using a tiled layout
> +*/
> + if (brw->gen >= 9 &&
> + (mt->target == GL_TEXTURE_1D ||
> +mt->target == GL_TEXTURE_1D_ARRAY)) {
> + GLenum base_format = _mesa_get_format_base_format(mt->format);
> +
> + if (base_format != GL_DEPTH_COMPONENT &&
> + base_format != GL_DEPTH_STENCIL)
&& base_format != GL_STENCIL_INDEX ?
You missed it or there is a reason to not do this check?
> + return true;
> + }
> +
> + return false;
> +}
> +
> static void
> brw_miptree_layout_texture_array(struct brw_context *brw,
> struct intel_mipmap_tree *mt)
> {
> int h0, h1;
> unsigned height = mt->physical_height0;
> + bool layout_1d = use_linear_1d_layout(brw, mt);
>
> h0 = ALIGN(mt->physical_height0, mt->align_h);
> h1 = ALIGN(minify(mt->physical_height0, 1), mt->align_h);
> @@ -258,7 +310,10 @@ brw_miptree_layout_texture_array(struct brw_context *brw,
>
> int physical_qpitch = mt->compressed ? mt->qpitch / 4 : mt->qpitch;
>
> - brw_miptree_layout_2d(mt);
> + if (layout_1d)
> + gen9_miptree_layout_1d(mt);
> + else
> + brw_miptree_layout_2d(mt);
>
> for (unsigned level = mt->first_level; level <= mt->last_level; level++) {
>unsigned img_height;
> @@ -392,7 +447,10 @@ brw_miptree_layout(struct brw_context *brw, struct
> intel_mipmap_tree *mt)
> break;
>case INTEL_MSAA_LAYOUT_NONE:
>case INTEL_MSAA_LAYOUT_IMS:
> - brw_miptree_layout_2d(mt);
> + if (use_linear_1d_layout(brw, mt))
> +gen9_miptree_layout_1d(mt);
> + else
> +brw_miptree_layout_2d(mt);
> break;
>}
>break;
> --
> 1.9.3
>
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
