Mesa (master): radeonsi: Pixel shaders pre-load one more SGPR

[Michel Dänzer]

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

Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Fri Aug  9 18:36:31 2013 +0200

radeonsi: Pixel shaders pre-load one more SGPR

Acked-by: Marek Olšák <maraeo at gmail.com>

---

 src/gallium/drivers/radeonsi/si_state_draw.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c
index c6ef8bd..47e64d8 100644
--- a/src/gallium/drivers/radeonsi/si_state_draw.c
+++ b/src/gallium/drivers/radeonsi/si_state_draw.c
@@ -236,9 +236,10 @@ static void si_pipe_shader_ps(struct pipe_context *ctx, struct si_pipe_shader *s
 
 	num_user_sgprs = SI_PS_NUM_USER_SGPR;
 	num_sgprs = shader->num_sgprs;
-	if (num_user_sgprs > num_sgprs) {
+	/* One SGPR after user SGPRs is pre-loaded with {prim_mask, lds_offset} */
+	if ((num_user_sgprs + 1) > num_sgprs) {
 		/* Last 2 reserved SGPRs are used for VCC */
-		num_sgprs = num_user_sgprs + 2;
+		num_sgprs = num_user_sgprs + 1 + 2;
 	}
 	assert(num_sgprs <= 104);