Mesa (master): freedreno/a3xx: fix gpu lockup in some piglit tests

[Rob Clark]

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

Author: Rob Clark <robclark at freedesktop.org>
Date:   Tue Sep  3 22:00:47 2013 -0400

freedreno/a3xx: fix gpu lockup in some piglit tests

The varying-out config comes from the inputs of the frag shader (so that
we aren't exporting unneeded varyinges).  The varyings-count should come
from the frag shader as well, to avoid a discrepency in configuration
and resulting gpu lockup.

Signed-off-by: Rob Clark <robclark at freedesktop.org>

---

 src/gallium/drivers/freedreno/a3xx/fd3_program.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_program.c b/src/gallium/drivers/freedreno/a3xx/fd3_program.c
index c6c51b1..d84bbe9 100644
--- a/src/gallium/drivers/freedreno/a3xx/fd3_program.c
+++ b/src/gallium/drivers/freedreno/a3xx/fd3_program.c
@@ -273,7 +273,7 @@ fd3_program_emit(struct fd_ringbuffer *ring,
 			A3XX_SP_VS_CTRL_REG1_CONSTFOOTPRINT(MAX2(vsi->max_const, 0)));
 	OUT_RING(ring, A3XX_SP_VS_PARAM_REG_POSREGID(vp->pos_regid) |
 			A3XX_SP_VS_PARAM_REG_PSIZEREGID(vp->psize_regid) |
-			A3XX_SP_VS_PARAM_REG_TOTALVSOUTVAR(vp->outputs_count));
+			A3XX_SP_VS_PARAM_REG_TOTALVSOUTVAR(fp->inputs_count));
 
 	assert(vp->outputs_count >= fp->inputs_count);