Call pPixmaps plain old pixmaps.

(cherry picked from commit f309d475241260cf60567100511d5f7c6c487a29)

Conflicts:

	src/i830.h
	src/i830_accel.c
	src/i830_batchbuffer.h
	src/i830_uxa.c

1 files changed, 7 insertions, 7 deletions

diff --git a/src/i965_render.c b/src/i965_render.c
index ff5c8c05..d283637d 100644
--- a/src/i965_render.c
+++ b/src/i965_render.c
@@ -1021,12 +1021,12 @@ static sampler_state_extend_t sampler_state_extend_from_picture(int repeat_type)
  */
 static void
 i965_set_picture_surface_state(dri_bo * ss_bo, int ss_index,
-			       PicturePtr picture, PixmapPtr pPixmap,
+			       PicturePtr picture, PixmapPtr pixmap,
 			       Bool is_dst)
 {
 	struct brw_surface_state_padded *ss;
 	struct brw_surface_state local_ss;
-	dri_bo *pixmap_bo = i830_get_pixmap_bo(pPixmap);
+	dri_bo *pixmap_bo = i830_get_pixmap_bo(pixmap);
 
 	ss = (struct brw_surface_state_padded *)ss_bo->virtual + ss_index;
 
@@ -1060,15 +1060,15 @@ i965_set_picture_surface_state(dri_bo * ss_bo, int ss_index,
 	if (pixmap_bo != NULL)
 		local_ss.ss1.base_addr = pixmap_bo->offset;
 	else
-		local_ss.ss1.base_addr = intel_get_pixmap_offset(pPixmap);
+		local_ss.ss1.base_addr = intel_get_pixmap_offset(pixmap);
 
 	local_ss.ss2.mip_count = 0;
 	local_ss.ss2.render_target_rotation = 0;
-	local_ss.ss2.height = pPixmap->drawable.height - 1;
-	local_ss.ss2.width = pPixmap->drawable.width - 1;
-	local_ss.ss3.pitch = intel_get_pixmap_pitch(pPixmap) - 1;
+	local_ss.ss2.height = pixmap->drawable.height - 1;
+	local_ss.ss2.width = pixmap->drawable.width - 1;
+	local_ss.ss3.pitch = intel_get_pixmap_pitch(pixmap) - 1;
 	local_ss.ss3.tile_walk = 0;	/* Tiled X */
-	local_ss.ss3.tiled_surface = i830_pixmap_tiled(pPixmap) ? 1 : 0;
+	local_ss.ss3.tiled_surface = i830_pixmap_tiled(pixmap) ? 1 : 0;
 
 	memcpy(ss, &local_ss, sizeof(local_ss));