From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Thu, 5 Jul 2018 16:56:55 +0000 (+0200)
Subject: radv: fix emitting the view index on GFX9
X-Git-Tag: android-x86-8.1-r1~2340
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=85865dbe0d96f18ac768b4063da94f52ee67a7fd;p=android-x86%2Fexternal-mesa.git

radv: fix emitting the view index on GFX9

For merged shaders, VS as HS for example.

Cc: <mesa-stable@lists.freedesktop.org>
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
---

diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index b7519dce49c..1ea023a8116 100644
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -3079,8 +3079,9 @@ static void radv_emit_view_index(struct radv_cmd_buffer *cmd_buffer, unsigned in
 {
 	struct radv_pipeline *pipeline = cmd_buffer->state.pipeline;
 	for (unsigned stage = 0; stage < MESA_SHADER_STAGES; ++stage) {
-		if (!pipeline->shaders[stage])
+		if (!radv_get_shader(pipeline, stage))
 			continue;
+
 		struct radv_userdata_info *loc = radv_lookup_user_sgpr(pipeline, stage, AC_UD_VIEW_INDEX);
 		if (loc->sgpr_idx == -1)
 			continue;