diff options
| author | Roland Scheidegger <sroland@vmware.com> | 2010-02-09 19:32:21 +0100 |
|---|---|---|
| committer | Roland Scheidegger <sroland@vmware.com> | 2010-02-09 19:32:21 +0100 |
| commit | 653a83445f94620673f747a4ace6847a2c7fdb4d (patch) | |
| tree | e2c6814da8d809813daffce530b37f3d283e96ff /src/gallium/drivers/r300/r300_state.c | |
| parent | b0613d87672ea08bb3b9cd56dee714fe413b670e (diff) | |
| parent | dd7be07c9685012b3e9fdfbaa13dc638abf6a9d1 (diff) | |
Merge branch 'gallium-nopointsizeminmax'
Conflicts:
src/gallium/drivers/nv10/nv10_state.c
src/gallium/drivers/nv20/nv20_state.c
src/gallium/drivers/nv50/nv50_program.c
Diffstat (limited to 'src/gallium/drivers/r300/r300_state.c')
| -rw-r--r-- | src/gallium/drivers/r300/r300_state.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/gallium/drivers/r300/r300_state.c b/src/gallium/drivers/r300/r300_state.c index 129eae1eae..d07e90860c 100644 --- a/src/gallium/drivers/r300/r300_state.c +++ b/src/gallium/drivers/r300/r300_state.c @@ -628,10 +628,12 @@ static void* r300_create_rs_state(struct pipe_context* pipe, rs->point_size = pack_float_16_6x(state->point_size) | (pack_float_16_6x(state->point_size) << R300_POINTSIZE_X_SHIFT); - rs->point_minmax = - ((int)(state->point_size_min * 6.0) << + /* set hw limits - clamping done by state tracker in vs or point_size + XXX always need to emit this? */ + rs->point_minmax = + ((int)(0.0 * 6.0) << R300_GA_POINT_MINMAX_MIN_SHIFT) | - ((int)(state->point_size_max * 6.0) << + ((int)(4096.0 * 6.0) << R300_GA_POINT_MINMAX_MAX_SHIFT); rs->line_control = pack_float_16_6x(state->line_width) | |