Mesa (master): st/mesa: minor simplification of some state atom assignments
Brian Paul
brianp at kemper.freedesktop.org
Wed Jul 9 13:03:39 UTC 2014
Module: Mesa
Branch: master
Commit: 971122a9c0d07751b73ea34afd79adeab087ab4d
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=971122a9c0d07751b73ea34afd79adeab087ab4d
Author: Brian Paul <brianp at vmware.com>
Date: Thu Jul 3 12:02:16 2014 -0600
st/mesa: minor simplification of some state atom assignments
---
src/mesa/state_tracker/st_atom_blend.c | 9 +++------
src/mesa/state_tracker/st_atom_rasterizer.c | 2 +-
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/mesa/state_tracker/st_atom_blend.c b/src/mesa/state_tracker/st_atom_blend.c
index 50d240a..064e0c1 100644
--- a/src/mesa/state_tracker/st_atom_blend.c
+++ b/src/mesa/state_tracker/st_atom_blend.c
@@ -263,16 +263,13 @@ update_blend( struct st_context *st )
blend->rt[i].colormask |= PIPE_MASK_A;
}
- if (ctx->Color.DitherFlag)
- blend->dither = 1;
+ blend->dither = ctx->Color.DitherFlag;
if (ctx->Multisample.Enabled) {
/* unlike in gallium/d3d10 these operations are only performed
if msaa is enabled */
- if (ctx->Multisample.SampleAlphaToCoverage)
- blend->alpha_to_coverage = 1;
- if (ctx->Multisample.SampleAlphaToOne)
- blend->alpha_to_one = 1;
+ blend->alpha_to_coverage = ctx->Multisample.SampleAlphaToCoverage;
+ blend->alpha_to_one = ctx->Multisample.SampleAlphaToOne;
}
cso_set_blend(st->cso_context, blend);
diff --git a/src/mesa/state_tracker/st_atom_rasterizer.c b/src/mesa/state_tracker/st_atom_rasterizer.c
index ee5e9e5..2bad643 100644
--- a/src/mesa/state_tracker/st_atom_rasterizer.c
+++ b/src/mesa/state_tracker/st_atom_rasterizer.c
@@ -245,7 +245,7 @@ static void update_raster_state( struct st_context *st )
}
/* _NEW_TRANSFORM */
- raster->depth_clip = ctx->Transform.DepthClamp == GL_FALSE;
+ raster->depth_clip = !ctx->Transform.DepthClamp;
raster->clip_plane_enable = ctx->Transform.ClipPlanesEnabled;
cso_set_rasterizer(st->cso_context, raster);
More information about the mesa-commit
mailing list