diff options
author | Ben Skeggs <skeggsb@gmail.com> | 2008-03-16 12:49:46 +1100 |
---|---|---|
committer | Ben Skeggs <skeggsb@gmail.com> | 2008-03-16 12:49:46 +1100 |
commit | c4354f84603cabb0e33ea3f586cc89bfdc27f79b (patch) | |
tree | 01585e52a3cca102c212630d8bac345058e150f6 /src/mesa/state_tracker/st_atom_rasterizer.c | |
parent | 5e17088ee3d0ddfa8871d92d262bb5242bdd92bd (diff) | |
parent | cb98f71d42e4c714dfb0c3e29d28d8418a1ee86b (diff) |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/mesa/state_tracker/st_atom_rasterizer.c')
-rw-r--r-- | src/mesa/state_tracker/st_atom_rasterizer.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_atom_rasterizer.c b/src/mesa/state_tracker/st_atom_rasterizer.c index 77cef9236b..17d77f90ae 100644 --- a/src/mesa/state_tracker/st_atom_rasterizer.c +++ b/src/mesa/state_tracker/st_atom_rasterizer.c @@ -223,7 +223,12 @@ static void update_raster_state( struct st_context *st ) raster->point_size_per_vertex = ctx->VertexProgram.PointSizeEnabled; } } - + if (!raster->point_size_per_vertex) { + /* clamp size now */ + raster->point_size = CLAMP(ctx->Point.Size, + ctx->Point.MinSize, + ctx->Point.MaxSize); + } /* _NEW_LINE */ |