diff options
| author | marha <marha@users.sourceforge.net> | 2011-02-10 07:28:40 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-02-10 07:28:40 +0000 |
| commit | 2eccc8cdcbff8a71ee25bac7cd71ef4f40564285 (patch) | |
| tree | 58fd671ace1ab27a8e71de1b66c2f4da3c2222c0 /mesalib/src/mesa/state_tracker/st_cb_fbo.c | |
| parent | 744bc6a5e71f207a33b0826598c1f93302f7fe01 (diff) | |
| parent | 183968dd18dc91f73325980bd511ed6bdb38b432 (diff) | |
| download | vcxsrv-2eccc8cdcbff8a71ee25bac7cd71ef4f40564285.tar.gz vcxsrv-2eccc8cdcbff8a71ee25bac7cd71ef4f40564285.tar.bz2 vcxsrv-2eccc8cdcbff8a71ee25bac7cd71ef4f40564285.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_cb_fbo.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_cb_fbo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_cb_fbo.c b/mesalib/src/mesa/state_tracker/st_cb_fbo.c index 3c73c24c5..b778ecf0b 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_fbo.c +++ b/mesalib/src/mesa/state_tracker/st_cb_fbo.c @@ -390,7 +390,7 @@ st_render_texture(struct gl_context *ctx, /* new surface for rendering into the texture */
memset(&surf_tmpl, 0, sizeof(surf_tmpl));
- surf_tmpl.format = util_format_linear(strb->texture->format);
+ surf_tmpl.format = ctx->Color.sRGBEnabled ? strb->texture->format : util_format_linear(strb->texture->format);
surf_tmpl.usage = PIPE_BIND_RENDER_TARGET;
surf_tmpl.u.tex.level = strb->rtt_level;
surf_tmpl.u.tex.first_layer = strb->rtt_face + strb->rtt_slice;
|