From 60909388ab136d849d99eab49e782a53772a618f Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 10 Nov 2004 15:46:52 +0000
Subject: 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.

---
 src/mesa/drivers/dri/radeon/radeon_subset_bitmap.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/mesa/drivers/dri/radeon')

diff --git a/src/mesa/drivers/dri/radeon/radeon_subset_bitmap.c b/src/mesa/drivers/dri/radeon/radeon_subset_bitmap.c
index cb4a514221..3ac20bd7b7 100644
--- a/src/mesa/drivers/dri/radeon/radeon_subset_bitmap.c
+++ b/src/mesa/drivers/dri/radeon/radeon_subset_bitmap.c
@@ -146,8 +146,8 @@ radeonPointsBitmap(  GLsizei width, GLsizei height,
    if (ctx->_RotateMode) {
       for (col=0; col<width; col++) {
 	 const GLubyte *src = (const GLubyte *) 
-	    _mesa_image_address( unpack, bitmap, height, width, 
-				 GL_COLOR_INDEX, GL_BITMAP, 0, col, 0 );
+	    _mesa_image_address2d(unpack, bitmap, height, width, 
+                                  GL_COLOR_INDEX, GL_BITMAP, col, 0 );
 	    
 	 /* Msb first */
 	 GLubyte mask = 128U >> (unpack->SkipPixels & 0x7);
@@ -166,8 +166,8 @@ radeonPointsBitmap(  GLsizei width, GLsizei height,
    else {
       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 );
 	    
 	 /* Msb first */
 	 GLubyte mask = 128U >> (unpack->SkipPixels & 0x7);
-- 
cgit v1.2.3