Mesa (master): st/mesa: rename srcImageStride -> srcRowStride and fix-up formatting
Brian Paul
brianp at kemper.freedesktop.org
Mon May 3 23:14:27 UTC 2010
Module: Mesa
Branch: master
Commit: e79086865bd67f860dfd0d5951395495530022bc
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e79086865bd67f860dfd0d5951395495530022bc
Author: Brian Paul <brianp at vmware.com>
Date: Mon May 3 15:51:00 2010 -0600
st/mesa: rename srcImageStride -> srcRowStride and fix-up formatting
---
src/mesa/state_tracker/st_cb_texture.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index d99bba6..434fbc3 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -700,22 +700,22 @@ st_TexImage(GLcontext * ctx,
* conversion and copy:
*/
if (compressed_src) {
- const GLuint srcImageStride = _mesa_format_row_stride(texImage->TexFormat, width);
- if(dstRowStride == srcImageStride)
+ const GLuint srcRowStride =
+ _mesa_format_row_stride(texImage->TexFormat, width);
+ if (dstRowStride == srcRowStride) {
memcpy(texImage->Data, pixels, imageSize);
- else
- {
+ }
+ else {
char *dst = texImage->Data;
const char *src = pixels;
GLuint i, bw, bh, lines;
_mesa_get_format_block_size(texImage->TexFormat, &bw, &bh);
lines = (height + bh - 1) / bh;
- for(i = 0; i < lines; ++i)
- {
- memcpy(dst, src, srcImageStride);
+ for (i = 0; i < lines; ++i) {
+ memcpy(dst, src, srcRowStride);
dst += dstRowStride;
- src += srcImageStride;
+ src += srcRowStride;
}
}
}
More information about the mesa-commit
mailing list