Mesa (master): r600g: only set the Z export if shader exports it.

[Dave Airlie]

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

Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Oct  1 15:16:47 2010 +1000

r600g: only set the Z export if shader exports it.

---

 src/gallium/drivers/r600/evergreen_state.c |    9 +++++----
 src/gallium/drivers/r600/r600_shader.c     |    9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c
index 2f5f1bf..4fa94e3 100644
--- a/src/gallium/drivers/r600/evergreen_state.c
+++ b/src/gallium/drivers/r600/evergreen_state.c
@@ -1531,10 +1531,11 @@ void evergreen_pipe_shader_ps(struct pipe_context *ctx, struct r600_pipe_shader
 		r600_pipe_state_add_reg(rstate, R_028644_SPI_PS_INPUT_CNTL_0 + i * 4, tmp, 0xFFFFFFFF, NULL);
 	}
 	for (i = 0; i < rshader->noutput; i++) {
-		r600_pipe_state_add_reg(rstate,
-				R_02880C_DB_SHADER_CONTROL,
-				S_02880C_Z_EXPORT_ENABLE(1),
-				S_02880C_Z_EXPORT_ENABLE(1), NULL);
+		if (rshader->input[i].name == TGSI_SEMANTIC_POSITION)
+			r600_pipe_state_add_reg(rstate,
+						R_02880C_DB_SHADER_CONTROL,
+						S_02880C_Z_EXPORT_ENABLE(1),
+						S_02880C_Z_EXPORT_ENABLE(1), NULL);
 	}
 
 	exports_ps = 0;
diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c
index d35a990..66cc035 100644
--- a/src/gallium/drivers/r600/r600_shader.c
+++ b/src/gallium/drivers/r600/r600_shader.c
@@ -127,10 +127,11 @@ static void r600_pipe_shader_ps(struct pipe_context *ctx, struct r600_pipe_shade
 		r600_pipe_state_add_reg(rstate, R_028644_SPI_PS_INPUT_CNTL_0 + i * 4, tmp, 0xFFFFFFFF, NULL);
 	}
 	for (i = 0; i < rshader->noutput; i++) {
-		r600_pipe_state_add_reg(rstate,
-				R_02880C_DB_SHADER_CONTROL,
-				S_02880C_Z_EXPORT_ENABLE(1),
-				S_02880C_Z_EXPORT_ENABLE(1), NULL);
+		if (rshader->input[i].name == TGSI_SEMANTIC_POSITION)
+			r600_pipe_state_add_reg(rstate,
+						R_02880C_DB_SHADER_CONTROL,
+						S_02880C_Z_EXPORT_ENABLE(1),
+						S_02880C_Z_EXPORT_ENABLE(1), NULL);
 	}
 
 	exports_ps = 0;