diff options
| author | marha <marha@users.sourceforge.net> | 2012-08-16 14:52:47 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-08-16 14:52:47 +0200 |
| commit | e12a88a1a4897365d47e428bceda547a4e02fbd0 (patch) | |
| tree | 116944397f595fd9b72d8de3b0a3783ccf3937ef /mesalib/src/mesa/state_tracker/st_atom_rasterizer.c | |
| parent | f5a4fa87e844b3ea2658a2355a4c4ac3393a65a1 (diff) | |
| parent | 4aac32998c2b173b84aec0b020aa086fef4b1423 (diff) | |
| download | vcxsrv-e12a88a1a4897365d47e428bceda547a4e02fbd0.tar.gz vcxsrv-e12a88a1a4897365d47e428bceda547a4e02fbd0.tar.bz2 vcxsrv-e12a88a1a4897365d47e428bceda547a4e02fbd0.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_atom_rasterizer.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_atom_rasterizer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_atom_rasterizer.c b/mesalib/src/mesa/state_tracker/st_atom_rasterizer.c index 204f505a6..d9e9d21f6 100644 --- a/mesalib/src/mesa/state_tracker/st_atom_rasterizer.c +++ b/mesalib/src/mesa/state_tracker/st_atom_rasterizer.c @@ -239,7 +239,8 @@ static void update_raster_state( struct st_context *st ) /* _NEW_FRAG_CLAMP */ raster->clamp_fragment_color = !st->clamp_frag_color_in_shader && - ctx->Color._ClampFragmentColor; + ctx->Color._ClampFragmentColor && + !ctx->DrawBuffer->_IntegerColor; raster->gl_rasterization_rules = 1; /* _NEW_RASTERIZER_DISCARD */ |