From eb4c088eb71f93b9639f4ff651523d794f1433f7 Mon Sep 17 00:00:00 2001 From: marha Date: Thu, 26 Jan 2012 10:35:11 +0100 Subject: xwininfo xcb-proto mesa xserver git update 26 12 2012 --- mesalib/src/mesa/state_tracker/st_atom_rasterizer.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'mesalib/src/mesa/state_tracker/st_atom_rasterizer.c') 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 */ -- cgit v1.2.3