Mesa (master): r600: add PIPE_SHADER_IR_NATIVE to supported shaders for cs

Timothy Arceri tarceri at kemper.freedesktop.org
Fri Feb 9 23:59:51 UTC 2018


Module: Mesa
Branch: master
Commit: 3af4f34e6113c3a8b4f62379127ab475de716056
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3af4f34e6113c3a8b4f62379127ab475de716056

Author: Timothy Arceri <tarceri at itsqueeze.com>
Date:   Fri Feb  9 11:59:54 2018 +1100

r600: add PIPE_SHADER_IR_NATIVE to supported shaders for cs

Acked-by: Pierre Moreau <pierre.morrow at free.fr>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>

---

 src/gallium/drivers/r600/r600_pipe.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c
index cc35d86709..fd8edcc9fb 100644
--- a/src/gallium/drivers/r600/r600_pipe.c
+++ b/src/gallium/drivers/r600/r600_pipe.c
@@ -603,10 +603,14 @@ static int r600_get_shader_param(struct pipe_screen* pscreen,
 		} else {
 			return PIPE_SHADER_IR_TGSI;
 		}
-	case PIPE_SHADER_CAP_SUPPORTED_IRS:
+	case PIPE_SHADER_CAP_SUPPORTED_IRS: {
+		int ir = 0;
+		if (shader == PIPE_SHADER_COMPUTE)
+			ir = 1 << PIPE_SHADER_IR_NATIVE;
 		if (rscreen->b.family >= CHIP_CEDAR)
-			return (1 << PIPE_SHADER_IR_TGSI);
-		return 0;
+			ir |= 1 << PIPE_SHADER_IR_TGSI;
+		return ir;
+	}
 	case PIPE_SHADER_CAP_TGSI_FMA_SUPPORTED:
 		if (rscreen->b.family == CHIP_ARUBA ||
 		    rscreen->b.family == CHIP_CAYMAN ||




More information about the mesa-commit mailing list