r600: Enable tesselation for NIR
authorGert Wollny <gert.wollny@collabora.com>
Wed, 15 Apr 2020 14:59:46 +0000 (16:59 +0200)
committerMarge Bot <eric+marge@anholt.net>
Tue, 28 Apr 2020 08:06:33 +0000 (08:06 +0000)
Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4714>

src/gallium/drivers/r600/r600_pipe.c

index 97f20355d599faf5b96cf4378dbe7c8edf8b9d25..3ffead9eb29edf56c3cf28b37913a0913d8b03d7 100644 (file)
@@ -420,7 +420,7 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
                return 1;
 
        case PIPE_CAP_SHADER_BUFFER_OFFSET_ALIGNMENT:
-               if (family >= CHIP_CEDAR && !is_nir_enabled(&rscreen->b))
+               if (family >= CHIP_CEDAR)
                        return 256;
                return 0;
 
@@ -559,8 +559,7 @@ static int r600_get_shader_param(struct pipe_screen* pscreen,
       /* 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 &&
-                   !is_nir_enabled(&rscreen->b))
+               if (rscreen->b.family >= CHIP_CEDAR)
                        break;
        case PIPE_SHADER_COMPUTE:
                if (!is_nir_enabled(&rscreen->b))