[Mesa-dev] [PATCH] i965/gen6: Use isl-based miptree also for stencil rbs

[Jason Ekstrand]

Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>

On Wed, Jun 21, 2017 at 12:35 PM, Topi Pohjolainen <
topi.pohjolainen at gmail.com> wrote:

> Fixes dEQP-EGL.functional.image.render_multiple_contexts.
> gles2_renderbuffer_stencil_stencil_buffer
>
> CC: Mark Janes <mark.a.janes at intel.com>
> CC: Jason Ekstrand <jason at jlekstrand.net>
> CC: Kenneth Graunke <kenneth at whitecape.org>
> Signed-off-by: Topi Pohjolainen <topi.pohjolainen at intel.com>
> ---
>  src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 19 ++++++++++++++++---
>  1 file changed, 16 insertions(+), 3 deletions(-)
>
> diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> index abc7f989db..69b02ead78 100644
> --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> @@ -897,7 +897,22 @@ intel_miptree_create_for_bo(struct brw_context *brw,
>  {
>     struct intel_mipmap_tree *mt;
>     uint32_t tiling, swizzle;
> -   GLenum target;
> +   const GLenum target = depth > 1 ? GL_TEXTURE_2D_ARRAY : GL_TEXTURE_2D;
> +
> +   if (brw->gen == 6 && format == MESA_FORMAT_S_UINT8) {
> +      mt = make_surface(brw, target, MESA_FORMAT_S_UINT8,
> +                        0, 0, width, height, depth, 1, ISL_TILING_W,
> +                        ISL_SURF_USAGE_STENCIL_BIT |
> +                        ISL_SURF_USAGE_TEXTURE_BIT,
> +                        BO_ALLOC_FOR_RENDER, bo);
> +      if (!mt)
> +         return NULL;
> +
> +      assert(bo->size >= mt->surf.size);
> +
> +      brw_bo_reference(bo);
> +      return mt;
> +   }
>
>     brw_bo_get_tiling(bo, &tiling, &swizzle);
>
> @@ -912,8 +927,6 @@ intel_miptree_create_for_bo(struct brw_context *brw,
>      */
>     assert(pitch >= 0);
>
> -   target = depth > 1 ? GL_TEXTURE_2D_ARRAY : GL_TEXTURE_2D;
> -
>     /* The BO already has a tiling format and we shouldn't confuse the
> lower
>      * layers by making it try to find a tiling format again.
>      */
> --
> 2.11.0
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20170621/c801d935/attachment.html>