radeonsi/gfx9: fix VM fault with fetched instance divisors
authorNicolai Hähnle <nicolai.haehnle@amd.com>
Wed, 15 Nov 2017 10:22:26 +0000 (11:22 +0100)
committerNicolai Hähnle <nicolai.haehnle@amd.com>
Mon, 20 Nov 2017 15:26:10 +0000 (16:26 +0100)
commitdf5ebe0c261e8d13683f2515be9ce263f5437bcd
tree98b760f2d034252aa279aa4bfc8ec050ff7e256d
parent3a32858fc3633193e3e7811ff8c59369a316a229
radeonsi/gfx9: fix VM fault with fetched instance divisors

We need to account for SGPR locations in merged shaders.

This case is exercised by KHR-GL45.enhanced_layouts.vertex_attrib_locations

Fixes: 79c2e7388c7f ("radeonsi/gfx9: use SPI_SHADER_USER_DATA_COMMON")
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
src/gallium/drivers/radeonsi/si_shader.c
src/gallium/drivers/radeonsi/si_shader.h