summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Olšák <maraeo@gmail.com>2013-02-14 12:48:12 +0100
committerAndreas Boll <andreas.boll.dev@gmail.com>2013-04-17 12:32:15 +0200
commit9c82987c2160f55d8153579e149b2ec0cd9b1cc3 (patch)
tree945f7c8552c0dba404cfc026996e1c59d567bc42
parenta21707ae13980f017daac014c2ec0f770742d749 (diff)
st/mesa: don't do sRGB conversion in CopyTexSubImage
Assuming I understand EXT_texture_sRGB correctly. NOTE: This is a candidate for the stable branches. Reviewed-by: Brian Paul <brianp@vmware.com> (cherry picked from commit 6520a86c6755f52a1364fcd21dc36a5cb8381a0e)
-rw-r--r--src/mesa/state_tracker/st_cb_texture.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index 923a8c9ab1..5ca4b7656b 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -963,8 +963,8 @@ st_CopyTexSubImage(struct gl_context *ctx, GLuint dims,
assert(strb->surface);
assert(stImage->pt);
- src_format = strb->surface->format;
- dest_format = stImage->pt->format;
+ src_format = util_format_linear(strb->surface->format);
+ dest_format = util_format_linear(stImage->pt->format);
/*
* Determine if the src framebuffer and dest texture have the same