summaryrefslogtreecommitdiffstats
path: root/src/mesa/state_tracker/st_atom_shader.c
diff options
context:
space:
mode:
authorMarek Olšák <maraeo@gmail.com>2012-08-04 13:32:21 +0200
committerMarek Olšák <maraeo@gmail.com>2012-08-15 19:20:57 +0200
commit03b78ceb50b97611bcaa2d2354ff5b505306b0a1 (patch)
treebda50f89370a73f757400031bd1491962278197f /src/mesa/state_tracker/st_atom_shader.c
parente06d6168cb4367728fac68264757a700932c2f73 (diff)
downloadexternal_mesa3d-03b78ceb50b97611bcaa2d2354ff5b505306b0a1.zip
external_mesa3d-03b78ceb50b97611bcaa2d2354ff5b505306b0a1.tar.gz
external_mesa3d-03b78ceb50b97611bcaa2d2354ff5b505306b0a1.tar.bz2
st/mesa: don't clamp fragment color with integer colorbuffer
Diffstat (limited to 'src/mesa/state_tracker/st_atom_shader.c')
-rw-r--r--src/mesa/state_tracker/st_atom_shader.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/state_tracker/st_atom_shader.c b/src/mesa/state_tracker/st_atom_shader.c
index ae34910..45e7a11 100644
--- a/src/mesa/state_tracker/st_atom_shader.c
+++ b/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 */