diff options
| author | Marek Olšák <[email protected]> | 2020-04-11 18:06:27 -0400 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2020-04-16 13:31:46 +0000 |
| commit | 80797edd7193409d0109d4d3378dd1b8d2597f80 (patch) | |
| tree | 994ef64819461af5f252b4fb0b6afe03cb727fde /src/mesa | |
| parent | 7a794b1de40df87edc359a36d14e214daa1bfe60 (diff) | |
st/mesa: fix a crash due to passing a draw vertex shader into the driver
Fixes: bc99b22a305be5e5a5f
Closes: #2754
Acked-by: Pierre-Eric Pelloux-Prayer <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4527>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/state_tracker/st_atom_shader.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_atom_shader.c b/src/mesa/state_tracker/st_atom_shader.c index fde2eb55f62..e09be71f59c 100644 --- a/src/mesa/state_tracker/st_atom_shader.c +++ b/src/mesa/state_tracker/st_atom_shader.c @@ -187,7 +187,8 @@ st_update_vp( struct st_context *st ) if (st->shader_has_one_variant[MESA_SHADER_VERTEX] && stvp->variants && - st_common_variant(stvp->variants)->key.passthrough_edgeflags == st->vertdata_edgeflags) { + st_common_variant(stvp->variants)->key.passthrough_edgeflags == st->vertdata_edgeflags && + !st_common_variant(stvp->variants)->key.is_draw_shader) { st->vp_variant = st_common_variant(stvp->variants); } else { struct st_common_variant_key key; |