On 10/08/2013 10:36 AM, Eric Anholt wrote:
> We had a fixup for gen4's 3d-layout cubemaps (which, iirc, we'd
> experimentally found to be necessary!), but while the spec still requires
> it on gen5, we'd been missing it in the array-layout cubemaps.
I think we didn't bother with that patch because we only support
GL_ARB_texture_cube_map_array on GEN6+. While I think this is a
reasonable change (keep the paths similar), I don't think it needs to be
picked back to stable... unless there's a way I'm not seeing that could
cause it to get hit...
For master,
Reviewed-by: Ian Romanick <ian.d.roman...@intel.com>
> Cc: "9.1 9.2" <mesa-sta...@lists.freedesktop.org>
> ---
> src/mesa/drivers/dri/i965/brw_tex_layout.c | 22 +++++++++++++++-------
> 1 file changed, 15 insertions(+), 7 deletions(-)
>
> diff --git a/src/mesa/drivers/dri/i965/brw_tex_layout.c
> b/src/mesa/drivers/dri/i965/brw_tex_layout.c
> index e4e66b4..e9128a3 100644
> --- a/src/mesa/drivers/dri/i965/brw_tex_layout.c
> +++ b/src/mesa/drivers/dri/i965/brw_tex_layout.c
> @@ -197,6 +197,18 @@ brw_miptree_layout_2d(struct intel_mipmap_tree *mt)
> }
>
> static void
> +align_cube(struct intel_mipmap_tree *mt)
> +{
> + /* The 965's sampler lays cachelines out according to how accesses
> + * in the texture surfaces run, so they may be "vertical" through
> + * memory. As a result, the docs say in Surface Padding Requirements:
> + * Sampling Engine Surfaces that two extra rows of padding are required.
> + */
> + if (mt->target == GL_TEXTURE_CUBE_MAP)
> + mt->total_height += 2;
> +}
> +
> +static void
> brw_miptree_layout_texture_array(struct brw_context *brw,
> struct intel_mipmap_tree *mt)
> {
> @@ -220,6 +232,8 @@ brw_miptree_layout_texture_array(struct brw_context *brw,
> }
> }
> mt->total_height = qpitch * mt->physical_depth0;
> +
> + align_cube(mt);
> }
>
> static void
> @@ -291,13 +305,7 @@ brw_miptree_layout_texture_3d(struct brw_context *brw,
> }
> }
>
> - /* The 965's sampler lays cachelines out according to how accesses
> - * in the texture surfaces run, so they may be "vertical" through
> - * memory. As a result, the docs say in Surface Padding Requirements:
> - * Sampling Engine Surfaces that two extra rows of padding are required.
> - */
> - if (mt->target == GL_TEXTURE_CUBE_MAP)
> - mt->total_height += 2;
> + align_cube(mt);
> }
>
> void
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
