diff options
| author | Brian Paul <brianp@vmware.com> | 2010-05-03 15:51:00 -0600 | 
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2010-05-03 15:51:00 -0600 | 
| commit | e79086865bd67f860dfd0d5951395495530022bc (patch) | |
| tree | 7b49bbccbfa682e3782b5ff3dcbd625ef68dc55b /src | |
| parent | c7d1d34c580e8c76bf2f3f8687223e648e7ec5f1 (diff) | |
st/mesa: rename srcImageStride -> srcRowStride and fix-up formatting
Diffstat (limited to 'src')
| -rw-r--r-- | 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 d99bba6124..434fbc301f 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;           }        }     } | 
