diff options
| author | Marek Olšák <[email protected]> | 2019-11-06 18:03:30 -0500 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2019-11-27 19:28:35 -0500 |
| commit | 754c7b893959d97483e6b5fccefbdbaa641c70ca (patch) | |
| tree | b9d365c835eff80e77e2f866ffa9d3bc60963dcc | |
| parent | cf240ea6a57dbe74c3104335c133b563ff8d73f6 (diff) | |
radeonsi: enable SPIR-V and GL 4.6 for NIR
Reviewed-by: Pierre-Eric Pelloux-Prayer <[email protected]>
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_get.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/gallium/drivers/radeonsi/si_get.c b/src/gallium/drivers/radeonsi/si_get.c index 8dc13ee08b2..4b63d6b7522 100644 --- a/src/gallium/drivers/radeonsi/si_get.c +++ b/src/gallium/drivers/radeonsi/si_get.c @@ -193,9 +193,9 @@ static int si_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_GLSL_FEATURE_LEVEL: case PIPE_CAP_GLSL_FEATURE_LEVEL_COMPATIBILITY: - if (sscreen->info.has_indirect_compute_dispatch) - return 450; - return 420; + if (!sscreen->info.has_indirect_compute_dispatch) + return 420; + return sscreen->options.enable_nir ? 460 : 450; case PIPE_CAP_MAX_TEXTURE_UPLOAD_MEMORY_BUDGET: /* Optimal number for good TexSubImage performance on Polaris10. */ @@ -216,9 +216,8 @@ static int si_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_PACKED_UNIFORMS: case PIPE_CAP_SHADER_SAMPLES_IDENTICAL: - if (sscreen->options.enable_nir) - return 1; - return 0; + case PIPE_CAP_GL_SPIRV: + return sscreen->options.enable_nir; case PIPE_CAP_PREFER_IMM_ARRAYS_AS_CONSTBUF: if (sscreen->options.enable_nir) |