diff options
| author | Gert Wollny <gert.wollny@collabora.com> | 2020-07-05 16:56:37 +0200 |
|---|---|---|
| committer | Gert Wollny <gw.fossdev@gmail.com> | 2020-08-09 13:45:36 +0000 |
| commit | 4975b3ec551d81460f07d0fe6a645c1e1f1548f1 (patch) | |
| tree | 1124f8c3e6973244743069fc6ba062019c275fd5 | |
| parent | 834a61df4ed4257ca4bb69fed6664c80cc726f82 (diff) | |
r600: Enable compute shaders for NIR code path
There are still regessions compared to TGSI, but there are also many
fixes.
Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6025>
| -rw-r--r-- | src/gallium/drivers/r600/r600_pipe.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c index e24bd1e4995..eb26074221a 100644 --- a/src/gallium/drivers/r600/r600_pipe.c +++ b/src/gallium/drivers/r600/r600_pipe.c @@ -559,14 +559,10 @@ static int r600_get_shader_param(struct pipe_screen* pscreen, if (rscreen->b.info.drm_minor >= 37) break; return 0; - /* With NIR we currently disable TES, TCS and COMP shaders */ case PIPE_SHADER_TESS_CTRL: case PIPE_SHADER_TESS_EVAL: - if (rscreen->b.family >= CHIP_CEDAR) - break; - /* fallthrough */ case PIPE_SHADER_COMPUTE: - if (!is_nir_enabled(&rscreen->b)) + if (rscreen->b.family >= CHIP_CEDAR) break; /* fallthrough */ default: |