diff options
| author | Nicolai Hähnle <[email protected]> | 2017-11-15 11:22:26 +0100 |
|---|---|---|
| committer | Nicolai Hähnle <[email protected]> | 2017-11-20 16:26:10 +0100 |
| commit | df5ebe0c261e8d13683f2515be9ce263f5437bcd (patch) | |
| tree | 98b760f2d034252aa279aa4bfc8ec050ff7e256d /src/gallium/drivers/radeonsi/si_shader.h | |
| parent | 3a32858fc3633193e3e7811ff8c59369a316a229 (diff) | |
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 <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeonsi/si_shader.h')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_shader.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gallium/drivers/radeonsi/si_shader.h b/src/gallium/drivers/radeonsi/si_shader.h index 41851627a87..148356b87ff 100644 --- a/src/gallium/drivers/radeonsi/si_shader.h +++ b/src/gallium/drivers/radeonsi/si_shader.h @@ -149,9 +149,6 @@ struct nir_shader; /* SGPR user data indices */ enum { - /* GFX9 merged shaders have RW_BUFFERS among the first 8 system SGPRs, - * and these two are used for other purposes. - */ SI_SGPR_RW_BUFFERS, /* rings (& stream-out, VS only) */ SI_SGPR_RW_BUFFERS_HI, SI_SGPR_BINDLESS_SAMPLERS_AND_IMAGES, @@ -455,6 +452,7 @@ union si_shader_part_key { unsigned num_merged_next_stage_vgprs:3; unsigned last_input:4; unsigned as_ls:1; + unsigned as_es:1; /* Prologs for monolithic shaders shouldn't set EXEC. */ unsigned is_monolithic:1; } vs_prolog; |