From: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Date: Mon, 12 Dec 2016 07:45:21 +0000 (+0100)
Subject: radv: Implement indirect dispatch for the MEC.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9b0efc98ba00467681a72107f1f2eb9025536540;p=mesa.git

radv: Implement indirect dispatch for the MEC.

Signed-off-by: Bas Nieuwenhuizen <basni@google.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
---

diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index 7d7f55a145b..3c5fe25ce6f 100644
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -2217,16 +2217,24 @@ void radv_CmdDispatchIndirect(
 		}
 	}
 
-	radeon_emit(cmd_buffer->cs, PKT3(PKT3_SET_BASE, 2, 0) |
-				    PKT3_SHADER_TYPE_S(1));
-	radeon_emit(cmd_buffer->cs, 1);
-	radeon_emit(cmd_buffer->cs, va);
-	radeon_emit(cmd_buffer->cs, va >> 32);
+	if (radv_cmd_buffer_uses_mec(cmd_buffer)) {
+		radeon_emit(cmd_buffer->cs, PKT3(PKT3_DISPATCH_INDIRECT, 2, 0) |
+					PKT3_SHADER_TYPE_S(1));
+		radeon_emit(cmd_buffer->cs, va);
+		radeon_emit(cmd_buffer->cs, va >> 32);
+		radeon_emit(cmd_buffer->cs, 1);
+	} else {
+		radeon_emit(cmd_buffer->cs, PKT3(PKT3_SET_BASE, 2, 0) |
+					PKT3_SHADER_TYPE_S(1));
+		radeon_emit(cmd_buffer->cs, 1);
+		radeon_emit(cmd_buffer->cs, va);
+		radeon_emit(cmd_buffer->cs, va >> 32);
 
-	radeon_emit(cmd_buffer->cs, PKT3(PKT3_DISPATCH_INDIRECT, 1, 0) |
-				    PKT3_SHADER_TYPE_S(1));
-	radeon_emit(cmd_buffer->cs, 0);
-	radeon_emit(cmd_buffer->cs, 1);
+		radeon_emit(cmd_buffer->cs, PKT3(PKT3_DISPATCH_INDIRECT, 1, 0) |
+					PKT3_SHADER_TYPE_S(1));
+		radeon_emit(cmd_buffer->cs, 0);
+		radeon_emit(cmd_buffer->cs, 1);
+	}
 
 	assert(cmd_buffer->cs->cdw <= cdw_max);
 }