diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-09-18 13:14:36 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-09-18 13:14:36 +1000 |
| commit | b1d8b6c4d986a6526f20e1e89982036f0ba85222 (patch) | |
| tree | 5ca75a54aff8c5504731fe1e3dead9bbe3b92c44 /src/mesa/state_tracker/st_atom_rasterizer.c | |
| parent | 6fca18696d0e6a243f6fbb5a30de45100a8e5fa0 (diff) | |
| parent | a06d38a74e865a0373a7314aad26b25c27ef8c57 (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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_atom_rasterizer.c b/src/mesa/state_tracker/st_atom_rasterizer.c index e286dc5116..fc47896c24 100644 --- a/src/mesa/state_tracker/st_atom_rasterizer.c +++ b/src/mesa/state_tracker/st_atom_rasterizer.c @@ -254,7 +254,7 @@ static void update_raster_state( struct st_context *st ) raster->line_stipple_factor = ctx->Line.StippleFactor - 1; /* _NEW_MULTISAMPLE */ - if (ctx->Multisample._Enabled) + if (ctx->Multisample._Enabled || st->force_msaa) raster->multisample = 1; /* _NEW_SCISSOR */ |