[Mesa-dev] [PATCH] i965/gen6: Set up layer constraints properly for depth buffers.

[Pohjolainen, Topi]

On Thu, Jun 25, 2015 at 09:17:38AM -0700, Kenneth Graunke wrote:
> This ports over Chris Forbes' equivalent fixes in gen7_misc_state.c
> from commit 77d55ef4819436ebbf9786a1e720ec00707bbb19.
> 
> No Piglit changes on Sandybridge.
> 
> Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>

Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>

> ---
>  src/mesa/drivers/dri/i965/gen6_depth_state.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/src/mesa/drivers/dri/i965/gen6_depth_state.c b/src/mesa/drivers/dri/i965/gen6_depth_state.c
> index 8f0d7dc..febd478 100644
> --- a/src/mesa/drivers/dri/i965/gen6_depth_state.c
> +++ b/src/mesa/drivers/dri/i965/gen6_depth_state.c
> @@ -73,7 +73,7 @@ gen6_emit_depth_stencil_hiz(struct brw_context *brw,
>     rb = (struct gl_renderbuffer*) irb;
>  
>     if (rb) {
> -      depth = MAX2(rb->Depth, 1);
> +      depth = MAX2(irb->layer_count, 1);
>        if (rb->TexImage)
>           gl_target = rb->TexImage->TexObject->Target;
>     }
> @@ -89,6 +89,10 @@ gen6_emit_depth_stencil_hiz(struct brw_context *brw,
>        surftype = BRW_SURFACE_2D;
>        depth *= 6;
>        break;
> +   case GL_TEXTURE_3D:
> +      assert(mt);
> +      depth = MAX2(mt->logical_depth0, 1);
> +      /* fallthrough */
>     default:
>        surftype = translate_tex_target(gl_target);
>        break;
> -- 
> 2.4.0
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev