diff options
| author | Axel Davy <axel.davy@ens.fr> | 2016-09-30 00:17:45 +0200 |
|---|---|---|
| committer | Axel Davy <axel.davy@ens.fr> | 2016-10-10 23:43:50 +0200 |
| commit | d2fd2966483dda23911dc89fdf9dbff02a87df6a (patch) | |
| tree | 25ac00a74ca04b5f7dc9e36f2a38b0cbce207e39 /src/gallium/state_trackers/nine | |
| parent | 71e7292a85cf6fffef87bed075ebfdde61180054 (diff) | |
| download | external_mesa3d-d2fd2966483dda23911dc89fdf9dbff02a87df6a.zip external_mesa3d-d2fd2966483dda23911dc89fdf9dbff02a87df6a.tar.gz external_mesa3d-d2fd2966483dda23911dc89fdf9dbff02a87df6a.tar.bz2 | |
st/nine: Fix the calculation of the number of vs inputs
Fixes hangs on radeonsi, and assert on llvmpipe.
Signed-off-by: Axel Davy <axel.davy@ens.fr>
Cc: "12.0" <mesa-stable@lists.freedesktop.org>
Diffstat (limited to 'src/gallium/state_trackers/nine')
| -rw-r--r-- | src/gallium/state_trackers/nine/nine_shader.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/state_trackers/nine/nine_shader.c b/src/gallium/state_trackers/nine/nine_shader.c index 20b6ed7..0f8bcdd 100644 --- a/src/gallium/state_trackers/nine/nine_shader.c +++ b/src/gallium/state_trackers/nine/nine_shader.c @@ -2141,7 +2141,7 @@ DECL_SPECIAL(DCL) ureg_DECL_vs_input(ureg, sem.reg.idx); assert(sem.reg.idx < ARRAY_SIZE(tx->info->input_map)); tx->info->input_map[sem.reg.idx] = sm1_to_nine_declusage(&sem); - tx->info->num_inputs = sem.reg.idx + 1; + tx->info->num_inputs = MAX2(tx->info->num_inputs, sem.reg.idx + 1); /* NOTE: preserving order in case of indirect access */ } else if (tx->version.major >= 3) { |