diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2004-11-10 15:46:52 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2004-11-10 15:46:52 +0000 |
| commit | 60909388ab136d849d99eab49e782a53772a618f (patch) | |
| tree | 84a981ea2e79b5e6477d05991119a23efa4429a5 /src/mesa/drivers/dri/r200 | |
| parent | f00d7edd746e4d1eec2d497419f21fb3b04f8bd4 (diff) | |
GL_(UN)PACK_SKIP_IMAGES should only be applied to 3D texture pack/unpacking
and ignored for 1D and 2D images.
Need to pass in image dimensions (1,2,3) to the _mesa_image_address() function.
This change gets propogated to some other routines.
Also added new _mesa_image_address[123]d() convenience functions.
Diffstat (limited to 'src/mesa/drivers/dri/r200')
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_swtcl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_swtcl.c b/src/mesa/drivers/dri/r200/r200_swtcl.c index 7fb91a0730..43f8365078 100644 --- a/src/mesa/drivers/dri/r200/r200_swtcl.c +++ b/src/mesa/drivers/dri/r200/r200_swtcl.c @@ -839,8 +839,8 @@ r200PointsBitmap( GLcontext *ctx, GLint px, GLint py, */ for (row=0; row<height; row++) { const GLubyte *src = (const GLubyte *) - _mesa_image_address( unpack, bitmap, width, height, - GL_COLOR_INDEX, GL_BITMAP, 0, row, 0 ); + _mesa_image_address2d(unpack, bitmap, width, height, + GL_COLOR_INDEX, GL_BITMAP, row, 0 ); if (unpack->LsbFirst) { /* Lsb first */ |