Mesa (master): mesa: move declaration before code in etc2_unpack_rgb8()
Brian Paul
brianp at kemper.freedesktop.org
Tue Apr 8 20:18:11 UTC 2014
Module: Mesa
Branch: master
Commit: 6f059725fa04aaea7881e2f574cdedad550d6bc9
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6f059725fa04aaea7881e2f574cdedad550d6bc9
Author: Brian Paul <brianp at vmware.com>
Date: Tue Apr 8 14:10:45 2014 -0600
mesa: move declaration before code in etc2_unpack_rgb8()
To fix MSVC build since cb4ad1368551b.
---
src/mesa/main/texcompress_etc.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/mesa/main/texcompress_etc.c b/src/mesa/main/texcompress_etc.c
index 7501982..ae973b0 100644
--- a/src/mesa/main/texcompress_etc.c
+++ b/src/mesa/main/texcompress_etc.c
@@ -685,15 +685,15 @@ etc2_unpack_rgb8(uint8_t *dst_row,
const unsigned h = MIN2(bh, height - y);
for (x = 0; x < width; x+= bw) {
- etc2_rgb8_parse_block(&block, src,
- false /* punchthrough_alpha */);
-
/*
* Destination texture may not be a multiple of four texels in
* width. Compute a safe width to avoid writing outside the texture.
*/
const unsigned w = MIN2(bw, width - x);
+ etc2_rgb8_parse_block(&block, src,
+ false /* punchthrough_alpha */);
+
for (j = 0; j < h; j++) {
uint8_t *dst = dst_row + (y + j) * dst_stride + x * comps;
for (i = 0; i < w; i++) {
More information about the mesa-commit
mailing list