summaryrefslogtreecommitdiff
path: root/src/gallium
diff options
context:
space:
mode:
authorMarek Olšák <maraeo@gmail.com>2010-02-05 05:55:15 +0100
committerCorbin Simpson <MostAwesomeDude@gmail.com>2010-02-06 23:25:29 -0800
commit93b9d911246e84b5f84714a87df6e28d068521b8 (patch)
tree8f89bf821529fdabd85760b8c14b2ec52ce292b1 /src/gallium
parentf02aec35e77b1d3944506e7622a4212dc88f84b5 (diff)
r300g: remove useless GA_COLOR_CONTROL emit
Already emitted in r300_emit_draw_xxx.
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/drivers/r300/r300_emit.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gallium/drivers/r300/r300_emit.c b/src/gallium/drivers/r300/r300_emit.c
index a429457625..575cc9fcdc 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;
}