diff options
author | marha <marha@users.sourceforge.net> | 2012-01-26 10:45:42 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-01-26 10:45:42 +0100 |
commit | 40bdd8b27f5c730b8d0c9a189e89fb51a5400611 (patch) | |
tree | 23d7ead2d11ebc95c1d0a5e57cdb2ee5b358110b /mesalib/src/mesa/state_tracker/st_atom_rasterizer.c | |
parent | ffbc36adb7ea5781a93731212226c47f1d49da5e (diff) | |
parent | eb4c088eb71f93b9639f4ff651523d794f1433f7 (diff) | |
download | vcxsrv-40bdd8b27f5c730b8d0c9a189e89fb51a5400611.tar.gz vcxsrv-40bdd8b27f5c730b8d0c9a189e89fb51a5400611.tar.bz2 vcxsrv-40bdd8b27f5c730b8d0c9a189e89fb51a5400611.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 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_atom_rasterizer.c b/mesalib/src/mesa/state_tracker/st_atom_rasterizer.c index f3d28e675..25799bf2b 100644 --- a/mesalib/src/mesa/state_tracker/st_atom_rasterizer.c +++ b/mesalib/src/mesa/state_tracker/st_atom_rasterizer.c @@ -112,7 +112,8 @@ static void update_raster_state( struct st_context *st ) raster->light_twoside = 1; } - raster->clamp_vertex_color = ctx->Light._ClampVertexColor; + raster->clamp_vertex_color = !st->clamp_vert_color_in_shader && + ctx->Light._ClampVertexColor; /* _NEW_POLYGON */ @@ -255,7 +256,8 @@ static void update_raster_state( struct st_context *st ) raster->scissor = 1; /* _NEW_FRAG_CLAMP */ - raster->clamp_fragment_color = ctx->Color._ClampFragmentColor; + raster->clamp_fragment_color = !st->clamp_frag_color_in_shader && + ctx->Color._ClampFragmentColor; raster->gl_rasterization_rules = 1; /* _NEW_RASTERIZER_DISCARD */ |