diff options
| author | Nicolai Hähnle <nicolai.haehnle@amd.com> | 2016-05-06 11:52:17 -0500 |
|---|---|---|
| committer | Nicolai Hähnle <nicolai.haehnle@amd.com> | 2016-05-09 11:52:46 -0500 |
| commit | fe102f7677547a48e2985b78ff6671a2ac9da9c4 (patch) | |
| tree | 10886e839dad78a674a70fca0fd1ef02babc7190 /src/gallium/drivers/radeonsi/si_shader.c | |
| parent | d8f3e8e6263214caa9daf914487595e6bd5aa0df (diff) | |
| download | external_mesa3d-fe102f7677547a48e2985b78ff6671a2ac9da9c4.zip external_mesa3d-fe102f7677547a48e2985b78ff6671a2ac9da9c4.tar.gz external_mesa3d-fe102f7677547a48e2985b78ff6671a2ac9da9c4.tar.bz2 | |
radeonsi: workaround for tesselation on SI
We request more than 32KB of LDS here, which SI doesn't have. Since LLVM
recently started checking the size of declared LDS allocations, all shaders
involved in tesselation fail to compile on SI.
Note that the entire calculation here seems wrong, given how we calculate
indices for generic attributes, so the number ends up wrong on CI+ as well.
A proper solution is clearly needed, but this patch should serve as a band-aid
for SI in the meantime.
Also note that the real size of the LDS allocation in hardware is independent
from what we tell LLVM, so this is really more of a "cosmetic" change.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=95198
Cc: "11.2" <mesa-stable@lists.freedesktop.org>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Diffstat (limited to 'src/gallium/drivers/radeonsi/si_shader.c')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_shader.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index 211db9f..12ccbab 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -4952,6 +4952,14 @@ static void declare_tess_lds(struct si_shader_context *ctx) unsigned patch_dw_size = vertex_data_dw_size*2 + patch_data_dw_size; unsigned lds_dwords = patch_dw_size; + if (ctx->screen->b.chip_class <= SI) { + /* This is a horrible temporary workaround to make tesselation + * not be completely broken on SI now that LLVM checks that + * the declared LDS size fits into the device maximum of 32KB. + */ + lds_dwords = 8 * 1024; + } + /* The actual size is computed outside of the shader to reduce * the number of shader variants. */ ctx->lds = |