st/mesa: s/unpack/pack/ to be more consistent

diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c
index 7c611cb4ec965802b984c71434f9c2e858e2d252..b937288f8c0dd60d24aa11c19d939ae4f21866ef 100644 (file)
--- a/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -939,7 +939,7 @@ st_CopyPixels(GLcontext *ctx, GLint srcx, GLint srcy,
    int ptw, pth;
    GLboolean invertTex = GL_FALSE;
    GLint readX, readY, readW, readH;
-   struct gl_pixelstore_attrib unpack = ctx->DefaultPacking;
+   struct gl_pixelstore_attrib pack = ctx->DefaultPacking;
 
    pipe->flush(pipe, PIPE_FLUSH_RENDER_CACHE, NULL);
 
@@ -1003,7 +1003,7 @@ st_CopyPixels(GLcontext *ctx, GLint srcx, GLint srcy,
    readY = srcy;
    readW = width;
    readH = height;
-   _mesa_clip_readpixels(ctx, &readX, &readY, &readW, &readH, &unpack);
+   _mesa_clip_readpixels(ctx, &readX, &readY, &readW, &readH, &pack);
    readW = MAX2(0, readW);
    readH = MAX2(0, readH);
 
@@ -1046,13 +1046,13 @@ st_CopyPixels(GLcontext *ctx, GLint srcx, GLint srcy,
       if (pipe->surface_copy) {
          pipe->surface_copy(pipe,
                             psTex,                               /* dest surf */
-                            unpack.SkipPixels, unpack.SkipRows,  /* dest pos */
+                            pack.SkipPixels, pack.SkipRows,      /* dest pos */
                             psRead,                              /* src surf */
                             readX, readY, readW, readH);         /* src region */
       } else {
          util_surface_copy(pipe, FALSE,
                            psTex,
-                           unpack.SkipPixels, unpack.SkipRows,
+                           pack.SkipPixels, pack.SkipRows,
                            psRead,
                            readX, readY, readW, readH);
       }
@@ -1091,7 +1091,7 @@ st_CopyPixels(GLcontext *ctx, GLint srcx, GLint srcy,
          /* alternate path using get/put_tile() */
          GLfloat *buf = (GLfloat *) malloc(width * height * 4 * sizeof(GLfloat));
          pipe_get_tile_rgba(ptRead, readX, readY, readW, readH, buf);
-         pipe_put_tile_rgba(ptTex, unpack.SkipPixels, unpack.SkipRows,
+         pipe_put_tile_rgba(ptTex, pack.SkipPixels, pack.SkipRows,
                             readW, readH, buf);
          free(buf);
       }
@@ -1099,7 +1099,7 @@ st_CopyPixels(GLcontext *ctx, GLint srcx, GLint srcy,
          /* GL_DEPTH */
          GLuint *buf = (GLuint *) malloc(width * height * sizeof(GLuint));
          pipe_get_tile_z(ptRead, readX, readY, readW, readH, buf);
-         pipe_put_tile_z(ptTex, unpack.SkipPixels, unpack.SkipRows,
+         pipe_put_tile_z(ptTex, pack.SkipPixels, pack.SkipRows,
                             readW, readH, buf);
          free(buf);
       }