From: Dave Airlie <airlied@redhat.com>
Date: Mon, 28 Nov 2016 00:56:37 +0000 (+0000)
Subject: radv: refactor out the descriptor user sgpr setting.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=11208f0049431a08328692874988503cd7742ede;p=mesa.git

radv: refactor out the descriptor user sgpr setting.

This just splits some common code into a utility function.

Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Signed-off-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 70a417c943f..54a9158d53c 100644
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -894,32 +894,32 @@ radv_cmd_buffer_flush_dynamic_state(struct radv_cmd_buffer *cmd_buffer)
 	cmd_buffer->state.dirty = 0;
 }
 
+static void
+emit_stage_descriptor_set_userdata(struct radv_cmd_buffer *cmd_buffer,
+				   int idx,
+				   uint64_t va,
+				   uint32_t base_reg)
+{
+	radeon_set_sh_reg_seq(cmd_buffer->cs,
+			      base_reg + 8 * idx, 2);
+	radeon_emit(cmd_buffer->cs, va);
+	radeon_emit(cmd_buffer->cs, va >> 32);
+}
+
 static void
 radv_emit_descriptor_set_userdata(struct radv_cmd_buffer *cmd_buffer,
 				  VkShaderStageFlags stages,
 				  struct radv_descriptor_set *set,
 				  unsigned idx)
 {
-	if (stages & VK_SHADER_STAGE_FRAGMENT_BIT) {
-		radeon_set_sh_reg_seq(cmd_buffer->cs,
-				      R_00B030_SPI_SHADER_USER_DATA_PS_0 + 8 * idx, 2);
-		radeon_emit(cmd_buffer->cs, set->va);
-		radeon_emit(cmd_buffer->cs, set->va >> 32);
-	}
+	if (stages & VK_SHADER_STAGE_FRAGMENT_BIT)
+		emit_stage_descriptor_set_userdata(cmd_buffer, idx, set->va, R_00B030_SPI_SHADER_USER_DATA_PS_0);
 
-	if (stages & VK_SHADER_STAGE_VERTEX_BIT) {
-		radeon_set_sh_reg_seq(cmd_buffer->cs,
-				      R_00B130_SPI_SHADER_USER_DATA_VS_0 + 8 * idx, 2);
-		radeon_emit(cmd_buffer->cs, set->va);
-		radeon_emit(cmd_buffer->cs, set->va >> 32);
-	}
+	if (stages & VK_SHADER_STAGE_VERTEX_BIT)
+		emit_stage_descriptor_set_userdata(cmd_buffer, idx, set->va, R_00B130_SPI_SHADER_USER_DATA_VS_0);
 
-	if (stages & VK_SHADER_STAGE_COMPUTE_BIT) {
-		radeon_set_sh_reg_seq(cmd_buffer->cs,
-				      R_00B900_COMPUTE_USER_DATA_0 + 8 * idx, 2);
-		radeon_emit(cmd_buffer->cs, set->va);
-		radeon_emit(cmd_buffer->cs, set->va >> 32);
-	}
+	if (stages & VK_SHADER_STAGE_COMPUTE_BIT)
+		emit_stage_descriptor_set_userdata(cmd_buffer, idx, set->va, R_00B900_COMPUTE_USER_DATA_0);
 }
 
 static void