diff options
| author | Marek Olšák <maraeo@gmail.com> | 2010-05-08 20:52:24 +0200 |
|---|---|---|
| committer | Marek Olšák <maraeo@gmail.com> | 2010-05-08 23:03:45 +0200 |
| commit | 34a5109bc2c3f625f178cb80c782b2218ba06f45 (patch) | |
| tree | a19ee26e8e42cea0ab778ff7caa3ae463d1adde5 /src/gallium/drivers/r300/r300_emit.c | |
| parent | ceafb391e60f63dba1cb998b00ef008d5364e61b (diff) | |
r300g: move GA_POINT_MINMAX back to rs_state
This basically reverts commit 74f94e8fdfe035fa68acdc19e6b0afc2957a4264.
Diffstat (limited to 'src/gallium/drivers/r300/r300_emit.c')
| -rw-r--r-- | src/gallium/drivers/r300/r300_emit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/r300/r300_emit.c b/src/gallium/drivers/r300/r300_emit.c index f3be274d76..9344b53324 100644 --- a/src/gallium/drivers/r300/r300_emit.c +++ b/src/gallium/drivers/r300/r300_emit.c @@ -525,8 +525,6 @@ void r300_emit_fb_state(struct r300_context* r300, unsigned size, void* state) OUT_CS(((fb->width + 1440-1) << R300_SCISSORS_X_SHIFT) | ((fb->height + 1440-1) << R300_SCISSORS_Y_SHIFT)); } - OUT_CS_REG(R300_GA_POINT_MINMAX, - (MAX2(fb->width, fb->height) * 6) << R300_GA_POINT_MINMAX_MAX_SHIFT); END_CS; } @@ -667,7 +665,9 @@ void r300_emit_rs_state(struct r300_context* r300, unsigned size, void* state) OUT_CS_REG(R300_GB_AA_CONFIG, rs->antialiasing_config); OUT_CS_REG(R300_GA_POINT_SIZE, rs->point_size); - OUT_CS_REG(R300_GA_LINE_CNTL, rs->line_control); + OUT_CS_REG_SEQ(R300_GA_POINT_MINMAX, 2); + OUT_CS(rs->point_minmax); + OUT_CS(rs->line_control); if (rs->polygon_offset_enable) { scale = rs->depth_scale * 12; |