fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 13:58:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

nir/lower_input_attachments: remove bogus assert in try_lower_input_texop()

Browse source 
It can be a sampler too.

Fixes: 84b08971fb ("nir/lower_input_attachments: lower nir_texop_fragment_{mask}_fetch")
Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/2558
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4043>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4043>
(cherry picked from commit 913d2dcd23)
This commit is contained in:
Samuel Pitoiset 2020-03-04 09:06:45 +01:00 • committed by Dylan Baker
parent a1041546ec
commit f64c5d0cf6
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -310,7 +310,7 @@
"description": "nir/lower_input_attachments: remove bogus assert in try_lower_input_texop()",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "84b08971fbdced78dbcb085d633298db7e4bfa7f"
},

1
src/compiler/nir/nir_lower_input_attachments.c
View file

@ -131,7 +131,6 @@ try_lower_input_texop(nir_function_impl *impl, nir_tex_instr *tex,
bool use_fragcoord_sysval)
{
nir_deref_instr *deref = nir_src_as_deref(tex->src[0].src);
assert(glsl_type_is_image(deref->type));
if (glsl_get_sampler_dim(deref->type) != GLSL_SAMPLER_DIM_SUBPASS_MS)
return false;