fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 22:49:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

st/mesa: clean up the sampler view format code

Browse source
This commit is contained in:
Brian Paul 2011-01-20 08:51:07 -07:00
parent 751fe9058b
commit 7330f8b2bc
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/mesa/state_tracker/st_atom_texture.c
View file

@ -218,22 +218,29 @@ update_textures(struct st_context *st)
continue;
}
/* Determine the format of the texture sampler view */
st_view_format = stObj->pt->format;
{
struct st_texture_image *firstImage;
enum pipe_format firstImageFormat;
firstImage = st_texture_image(stObj->base.Image[0][stObj->base.BaseLevel]);
const struct st_texture_image *firstImage =
st_texture_image(stObj->base.Image[0][stObj->base.BaseLevel]);
const gl_format texFormat = firstImage->base.TexFormat;
enum pipe_format firstImageFormat =
st_mesa_format_to_pipe_format(texFormat);
firstImageFormat = st_mesa_format_to_pipe_format(firstImage->base.TexFormat);
if ((stObj->base.sRGBDecode == GL_SKIP_DECODE_EXT) &&
(_mesa_get_format_color_encoding(firstImage->base.TexFormat) == GL_SRGB)) {
firstImageFormat = st_mesa_format_to_pipe_format(_mesa_get_srgb_format_linear(firstImage->base.TexFormat));
(_mesa_get_format_color_encoding(texFormat) == GL_SRGB)) {
/* don't do sRGB->RGB conversion. Interpret the texture
* texture data as linear values.
*/
const gl_format linearFormat =
_mesa_get_srgb_format_linear(texFormat);
firstImageFormat = st_mesa_format_to_pipe_format(linearFormat);
}
if (firstImageFormat != stObj->pt->format)
st_view_format = firstImageFormat;
}
st->state.num_textures = su + 1;
/* if sampler view has changed dereference it */