aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/state_tracker
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-07-29 11:17:40 +0200
committermarha <marha@users.sourceforge.net>2011-07-29 11:17:40 +0200
commita69cff9373daf6b7afc97fb975ceb4fc0d6864f7 (patch)
tree2c04fb8e0dc217b9f418c8ec37f17973a93779a2 /mesalib/src/mesa/state_tracker
parentfa08275a130f5693e2add977df7cf38d44f2f8da (diff)
parent28257038c4f13ac26127d536c14c922aa036efed (diff)
downloadvcxsrv-a69cff9373daf6b7afc97fb975ceb4fc0d6864f7.tar.gz
vcxsrv-a69cff9373daf6b7afc97fb975ceb4fc0d6864f7.tar.bz2
vcxsrv-a69cff9373daf6b7afc97fb975ceb4fc0d6864f7.zip
Merge remote-tracking branch 'origin/released'
Conflicts: libX11/configure.ac mesalib/src/mesa/main/ff_fragment_shader.cpp mesalib/src/mesa/main/framebuffer.c mesalib/src/mesa/main/texparam.c pixman/pixman/pixman-arm-neon-asm.S
Diffstat (limited to 'mesalib/src/mesa/state_tracker')
-rw-r--r--mesalib/src/mesa/state_tracker/st_atom_texture.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_atom_texture.c b/mesalib/src/mesa/state_tracker/st_atom_texture.c
index 800a9f1f0..3115a2511 100644
--- a/mesalib/src/mesa/state_tracker/st_atom_texture.c
+++ b/mesalib/src/mesa/state_tracker/st_atom_texture.c
@@ -221,9 +221,9 @@ update_single_texture(struct st_context *st, struct pipe_sampler_view **sampler_
if ((samp->sRGBDecode == GL_SKIP_DECODE_EXT) &&
(_mesa_get_format_color_encoding(texFormat) == GL_SRGB)) {
- /* don't do sRGB->RGB conversion. Interpret the texture
- * texture data as linear values.
- */
+ /* Don't do sRGB->RGB conversion. Interpret the texture data as
+ * linear values.
+ */
const gl_format linearFormat =
_mesa_get_srgb_format_linear(texFormat);
firstImageFormat = st_mesa_format_to_pipe_format(linearFormat);