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_cb_bitmap.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_cb_bitmap.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_cb_bitmap.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_cb_bitmap.c b/mesalib/src/mesa/state_tracker/st_cb_bitmap.c index a97096802..7c0254d8d 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_bitmap.c +++ b/mesalib/src/mesa/state_tracker/st_cb_bitmap.c @@ -450,6 +450,8 @@ draw_bitmap_quad(struct gl_context *ctx, GLint x, GLint y, GLfloat z, memset(&key, 0, sizeof(key)); key.st = st; key.bitmap = GL_TRUE; + key.clamp_color = st->clamp_frag_color_in_shader && + st->ctx->Color._ClampFragmentColor; fpv = st_get_fp_variant(st, st->fp, &key); |