Mesa (master): r600g: fix some interpolation tests for evergreen

Dave Airlie airlied at kemper.freedesktop.org
Sun Jan 22 07:28:22 UTC 2012


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

Author: Vadim Girlin <vadimgirlin at gmail.com>
Date:   Sun Jan 22 00:17:10 2012 +0400

r600g: fix some interpolation tests for evergreen

Same fix as previously done by Dave Airlie for r600/r700

Signed-off-by: Vadim Girlin <vadimgirlin at gmail.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>

---

 src/gallium/drivers/r600/evergreen_state.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c
index 96c1144..a713e24 100644
--- a/src/gallium/drivers/r600/evergreen_state.c
+++ b/src/gallium/drivers/r600/evergreen_state.c
@@ -2315,14 +2315,14 @@ void evergreen_pipe_shader_ps(struct pipe_context *ctx, struct r600_pipe_shader
 
 			tmp = S_028644_SEMANTIC(sid);
 
-			if (rshader->input[i].name == TGSI_SEMANTIC_COLOR ||
-					rshader->input[i].name == TGSI_SEMANTIC_BCOLOR ||
-					rshader->input[i].name == TGSI_SEMANTIC_POSITION) {
+			if (rshader->input[i].name == TGSI_SEMANTIC_POSITION ||
+				rshader->input[i].interpolate == TGSI_INTERPOLATE_COLOR ||
+				rshader->input[i].interpolate == TGSI_INTERPOLATE_CONSTANT) {
 				tmp |= S_028644_FLAT_SHADE(1);
 			}
 
 			if (rshader->input[i].name == TGSI_SEMANTIC_GENERIC &&
-					rctx->sprite_coord_enable & (1 << rshader->input[i].sid)) {
+					(rctx->sprite_coord_enable & (1 << rshader->input[i].sid))) {
 				tmp |= S_028644_PT_SPRITE_TEX(1);
 			}
 




More information about the mesa-commit mailing list