From fe026d7ce5c59535c5296004b94138bdf8ef613c Mon Sep 17 00:00:00 2001 From: Neil Roberts Date: Tue, 31 Mar 2015 14:58:28 +0100 Subject: [PATCH] i965/skl: Avoid using the 1D stencil layout for stencil-only images Commit cf67ca9ffa9 made the layouting code pick a special layout for 1D images on Skylake. This should not be used for depth and stencil buffers because these need to be treated as 2D tiled images. However the patch was missing a check for images with a base format of GL_STENCIL_INDEX. In practice I don't think it's currently possible to hit this because Mesa doesn't support GL_ARB_texture_stencil8 and it's not possible to create a 1D renderbuffer, but it'll be good to be ready for when the extension is supported. Reviewed-by: Anuj Phogat --- src/mesa/drivers/dri/i965/brw_tex_layout.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mesa/drivers/dri/i965/brw_tex_layout.c b/src/mesa/drivers/dri/i965/brw_tex_layout.c index 5e70cd26c7e..7a1e09d692c 100644 --- a/src/mesa/drivers/dri/i965/brw_tex_layout.c +++ b/src/mesa/drivers/dri/i965/brw_tex_layout.c @@ -289,7 +289,8 @@ use_linear_1d_layout(struct brw_context *brw, GLenum base_format = _mesa_get_format_base_format(mt->format); if (base_format != GL_DEPTH_COMPONENT && - base_format != GL_DEPTH_STENCIL) + base_format != GL_DEPTH_STENCIL && + base_format != GL_STENCIL_INDEX) return true; } -- 2.30.2