From aa14851340f1a3b5cda9275989f20acff039870e Mon Sep 17 00:00:00 2001 From: Ilia Mirkin Date: Thu, 10 Jun 2021 00:20:04 -0400 Subject: [PATCH] nv50: use the no-mipmap texture type for 2d ms views There are size restrictions on 2D images which can't accommodate the *full* 2D MSAA image. There's no way to make it work for 2D MSAA Array images, but at least for the non-array variants, we can use the no-mipmap variant which has a larger maximum size. Fixes dEQP-GLES31.functional.shaders.builtin_functions.texture_size.*2d Signed-off-by: Ilia Mirkin Reviewed-by: Karol Herbst Part-of: --- src/gallium/drivers/nouveau/nv50/nv50_tex.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/nouveau/nv50/nv50_tex.c b/src/gallium/drivers/nouveau/nv50/nv50_tex.c index abeb916..67c4750 100644 --- a/src/gallium/drivers/nouveau/nv50/nv50_tex.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_tex.c @@ -161,7 +161,10 @@ nv50_create_texture_view(struct pipe_context *pipe, tic[2] |= G80_TIC_2_TEXTURE_TYPE_ONE_D; break; case PIPE_TEXTURE_2D: - tic[2] |= G80_TIC_2_TEXTURE_TYPE_TWO_D; + if (mt->ms_x) + tic[2] |= G80_TIC_2_TEXTURE_TYPE_TWO_D_NO_MIPMAP; + else + tic[2] |= G80_TIC_2_TEXTURE_TYPE_TWO_D; break; case PIPE_TEXTURE_RECT: tic[2] |= G80_TIC_2_TEXTURE_TYPE_TWO_D_NO_MIPMAP; -- 2.7.4