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_shader.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_shader.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_atom_shader.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_atom_shader.c b/mesalib/src/mesa/state_tracker/st_atom_shader.c index ae3491097..45e7a117f 100644 --- a/mesalib/src/mesa/state_tracker/st_atom_shader.c +++ b/mesalib/src/mesa/state_tracker/st_atom_shader.c @@ -85,7 +85,8 @@ update_fp( struct st_context *st ) /* _NEW_FRAG_CLAMP */ key.clamp_color = st->clamp_frag_color_in_shader && - st->ctx->Color._ClampFragmentColor; + st->ctx->Color._ClampFragmentColor && + !st->ctx->DrawBuffer->_IntegerColor; st->fp_variant = st_get_fp_variant(st, stfp, &key); @@ -106,7 +107,7 @@ update_fp( struct st_context *st ) const struct st_tracked_state st_update_fp = { "st_update_fp", /* name */ { /* dirty */ - 0, /* mesa */ + _NEW_BUFFERS, /* mesa */ ST_NEW_FRAGMENT_PROGRAM /* st */ }, update_fp /* update */ |