From: Gert Wollny <gert.wollny@collabora.com>
Date: Sun, 5 Jul 2020 14:56:37 +0000 (+0200)
Subject: r600: Enable compute shaders for NIR code path
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4975b3ec551d81460f07d0fe6a645c1e1f1548f1;p=mesa.git

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>
---

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: