From: Marek Olšák <maraeo@gmail.com>
Date: Fri, 5 Feb 2010 04:55:15 +0000 (+0100)
Subject: r300g: remove useless GA_COLOR_CONTROL emit
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=93b9d911246e84b5f84714a87df6e28d068521b8;p=mesa.git

r300g: remove useless GA_COLOR_CONTROL emit

Already emitted in r300_emit_draw_xxx.
---

diff --git a/src/gallium/drivers/r300/r300_emit.c b/src/gallium/drivers/r300/r300_emit.c
index a429457625a..575cc9fcdcb 100644
--- a/src/gallium/drivers/r300/r300_emit.c
+++ b/src/gallium/drivers/r300/r300_emit.c
@@ -592,7 +592,7 @@ void r300_emit_rs_state(struct r300_context* r300, void* state)
     float scale, offset;
     CS_LOCALS(r300);
 
-    BEGIN_CS(20 + (rs->polygon_offset_enable ? 5 : 0));
+    BEGIN_CS(18 + (rs->polygon_offset_enable ? 5 : 0));
     OUT_CS_REG(R300_VAP_CNTL_STATUS, rs->vap_control_status);
 
     OUT_CS_REG(R300_GB_AA_CONFIG, rs->antialiasing_config);
@@ -627,7 +627,6 @@ void r300_emit_rs_state(struct r300_context* r300, void* state)
     OUT_CS(rs->cull_mode);
     OUT_CS_REG(R300_GA_LINE_STIPPLE_CONFIG, rs->line_stipple_config);
     OUT_CS_REG(R300_GA_LINE_STIPPLE_VALUE, rs->line_stipple_value);
-    OUT_CS_REG(R300_GA_COLOR_CONTROL, rs->color_control);
     OUT_CS_REG(R300_GA_POLY_MODE, rs->polygon_mode);
     END_CS;
 }