diff options
| author | Marek Olšák <[email protected]> | 2013-02-12 21:00:43 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2013-02-13 16:38:19 +0100 |
| commit | 60aa5f360a01ff56ba9566ac86c4e68543d829a5 (patch) | |
| tree | 0a0cfd2dddb7e0303b94298ecd36eead6c338635 /src/mesa/state_tracker | |
| parent | 8cabe26f5dc4c66ae59649cfd7b25f761cda250b (diff) | |
st/mesa: fix texture buffer objects
Broken by 624528834f53f54c7a934f929769b7e6b230a0b1.
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa/state_tracker')
| -rw-r--r-- | src/mesa/state_tracker/st_atom_texture.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/mesa/state_tracker/st_atom_texture.c b/src/mesa/state_tracker/st_atom_texture.c index 28327bc14d9..fc2d69013ae 100644 --- a/src/mesa/state_tracker/st_atom_texture.c +++ b/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 */ |