On Wed, May 3, 2017 at 2:22 AM, Topi Pohjolainen <topi.pohjolai...@gmail.com
> wrote:
> Signed-off-by: Topi Pohjolainen <topi.pohjolai...@intel.com>
> ---
> src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 12 ++++++++++++
> 1 file changed, 12 insertions(+)
>
> diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> index 3a4ac14..55f6027 100644
> --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> @@ -1012,6 +1012,18 @@ intel_miptree_match_image(struct intel_mipmap_tree
> *mt,
> if (mt->target == GL_TEXTURE_CUBE_MAP)
> depth = 6;
>
> + if (mt->surf.size > 0) {
> + const unsigned level_depth =
> + mt->surf.dim_layout == ISL_DIM_LAYOUT_GEN4_3D ?
>
I'm fairly sure you want mt->surf.dim == ISL_DIM_3D here instead. There
are two potential layouts for 3D surfaces and they will both have the
"depth" in the depth field. I'm a bit surprised that this passed Jenkins
though I guess you've just done it for depth for now. This comment applies
to a good chunk of the next 15 patches or so.
--Jason
> + minify(mt->surf.logical_level0_px.depth, level) :
> + mt->surf.logical_level0_px.array_len;
> +
> + return width == minify(mt->surf.logical_level0_px.width, level) &&
> + height == minify(mt->surf.logical_level0_px.height, level)
> &&
> + depth == level_depth &&
> + MAX2(image->NumSamples, 1) == mt->surf.samples;
> + }
> +
> int level_depth = mt->level[level].depth;
> if (mt->num_samples > 1) {
> switch (mt->msaa_layout) {
> --
> 2.9.3
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
