nir/lower_fragcolor: Fix driver_location assignment

Fixes crash in
dEQP-GLES31.functional.shaders.framebuffer_fetch.basic.last_frag_data
when using this pass.

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10411>
(cherry picked from commit 73eb497b86)
This commit is contained in:
Alyssa Rosenzweig 2021-04-22 11:23:39 -04:00 committed by Eric Engestrom
parent 899f030fd3
commit f85a1f0579
2 changed files with 2 additions and 2 deletions

View file

@ -9094,7 +9094,7 @@
"description": "nir/lower_fragcolor: Fix driver_location assignment",
"nominated": false,
"nomination_type": null,
"resolution": 4,
"resolution": 1,
"master_sha": null,
"because_sha": null
},

View file

@ -80,7 +80,7 @@ lower_fragcolor_instr(nir_intrinsic_instr *instr, nir_builder *b, unsigned max_d
glsl_vec4_type(),
name);
out_color->data.location = FRAG_RESULT_DATA0 + i;
out_color->data.driver_location = i;
out_color->data.driver_location = b->shader->num_outputs++;
out_color->data.index = out->data.index;
nir_store_var(b, out_color, frag_color, writemask);
}