summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2010-03-18 09:17:11 -0600
committerBrian Paul <brianp@vmware.com>2010-03-18 09:17:11 -0600
commitb7e8039132830a2cd7a75691d11750d2ccc0a4e2 (patch)
treef5342258fa272f182b2945530ecc115d57ea8dac /src/mesa
parent38bd7282f2c2d28681f1c242545727e4c36df113 (diff)
st/mesa: s/unpack/pack/ to be more consistent
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/state_tracker/st_cb_drawpixels.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c
index 7c611cb4ec..b937288f8c 100644
--- 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);
}