diff options
| author | marha <marha@users.sourceforge.net> | 2013-02-15 08:22:54 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-02-15 08:22:54 +0100 |
| commit | 0b2fa092281e667dbb02942008b16510af1086ef (patch) | |
| tree | 350352f14a2a6f98d2f5a5356eb63aeae67d6047 /mesalib/src/mesa/state_tracker/st_atom_texture.c | |
| parent | 1de47a7fc53a67beccab830178aaa0118ed4734f (diff) | |
| parent | 6f6a2340d40759b77ef43965efdd24f3e4e623fd (diff) | |
| download | vcxsrv-0b2fa092281e667dbb02942008b16510af1086ef.tar.gz vcxsrv-0b2fa092281e667dbb02942008b16510af1086ef.tar.bz2 vcxsrv-0b2fa092281e667dbb02942008b16510af1086ef.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libxcb mesa xserver xkeyboard-config git update 15 Feb 2013
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_atom_texture.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_atom_texture.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_atom_texture.c b/mesalib/src/mesa/state_tracker/st_atom_texture.c index 28327bc14..fc2d69013 100644 --- a/mesalib/src/mesa/state_tracker/st_atom_texture.c +++ b/mesalib/src/mesa/state_tracker/st_atom_texture.c @@ -234,11 +234,17 @@ update_single_texture(struct st_context *st, } /* Determine the format of the texture sampler view */ - view_format = stObj->pt->format; + if (texObj->Target == GL_TEXTURE_BUFFER) { + view_format = + st_mesa_format_to_pipe_format(stObj->base._BufferObjectFormat); + } + else { + view_format = stObj->pt->format; - /* If sRGB decoding is off, use the linear format */ - if (samp->sRGBDecode == GL_SKIP_DECODE_EXT) { - view_format = util_format_linear(view_format); + /* If sRGB decoding is off, use the linear format */ + if (samp->sRGBDecode == GL_SKIP_DECODE_EXT) { + view_format = util_format_linear(view_format); + } } /* if sampler view has changed dereference it */ |