diff options
| author | marha <marha@users.sourceforge.net> | 2014-03-31 18:04:51 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-03-31 18:04:51 +0200 |
| commit | edb5b380994125bf33929ef7dc5a3c456dfbe93b (patch) | |
| tree | d5bb36474f380ce6c15d9f1b46e8f794cc6e8f9f /mesalib/src/mesa/state_tracker | |
| parent | 6469a282ad06dfa53f3b9d9e9789f21b76de9ab7 (diff) | |
| download | vcxsrv-edb5b380994125bf33929ef7dc5a3c456dfbe93b.tar.gz vcxsrv-edb5b380994125bf33929ef7dc5a3c456dfbe93b.tar.bz2 vcxsrv-edb5b380994125bf33929ef7dc5a3c456dfbe93b.zip | |
libxtrans mesa git update 31 Mar 2014
libxtrans commit a57a7f62242e1ea972b81414741729bf3dbae0a4
mesa commit d681b22ed77274a805c6c8e81925c18eeb57a968
Diffstat (limited to 'mesalib/src/mesa/state_tracker')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_format.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_format.c b/mesalib/src/mesa/state_tracker/st_format.c index cd6b46681..38d4ccfea 100644 --- a/mesalib/src/mesa/state_tracker/st_format.c +++ b/mesalib/src/mesa/state_tracker/st_format.c @@ -1750,6 +1750,12 @@ st_choose_matching_format(struct pipe_screen *screen, unsigned bind, if (_mesa_get_format_color_encoding(mesa_format) == GL_SRGB) { continue; } + if (_mesa_get_format_bits(mesa_format, GL_TEXTURE_INTENSITY_SIZE) > 0) { + /* If `format` is GL_RED/GL_RED_INTEGER, then we might match some + * intensity formats, which we don't want. + */ + continue; + } if (_mesa_format_matches_format_and_type(mesa_format, format, type, swapBytes)) { |