diff --git a/glamor/glamor_getspans.c b/glamor/glamor_getspans.c
index 237c1e789..e1a20baef 100644
--- a/glamor/glamor_getspans.c
+++ b/glamor/glamor_getspans.c
@@ -41,7 +41,7 @@ glamor_get_spans(DrawablePtr drawable,
 {
     PixmapPtr pixmap = glamor_get_drawable_pixmap(drawable);
     GLenum format, type;
-    int ax;
+    int no_alpha;
     glamor_screen_private *glamor_priv = glamor_get_screen_private(drawable->pScreen);
     glamor_pixmap_private *pixmap_priv = glamor_get_pixmap_private(pixmap);
     int i;
@@ -56,7 +56,7 @@ glamor_get_spans(DrawablePtr drawable,
     if (glamor_get_tex_format_type_from_pixmap(pixmap,
                                                &format, 
                                                &type, 
-                                               &ax
+                                               &no_alpha
                                                )) {
       glamor_fallback("unknown depth. %d \n", 
                      drawable->depth);
diff --git a/glamor/glamor_pixmap.c b/glamor/glamor_pixmap.c
index 5ac62f4e7..8ca1318ab 100644
--- a/glamor/glamor_pixmap.c
+++ b/glamor/glamor_pixmap.c
@@ -272,7 +272,8 @@ __glamor_upload_pixmap_to_texture(PixmapPtr pixmap, GLenum format, GLenum type,
  * */
 
 static void
-_glamor_upload_pixmap_to_texture(PixmapPtr pixmap, GLenum format, GLenum type, int ax, int flip)
+_glamor_upload_pixmap_to_texture(PixmapPtr pixmap, GLenum format, 
+                                 GLenum type, int no_alpha, int flip)
 {
 
   glamor_pixmap_private *pixmap_priv = glamor_get_pixmap_private(pixmap);
@@ -299,7 +300,7 @@ _glamor_upload_pixmap_to_texture(PixmapPtr pixmap, GLenum format, GLenum type, i
   /* Try fast path firstly, upload the pixmap to the texture attached
    * to the fbo directly. */
 
-  if (ax == 0 && !need_flip) {
+  if (no_alpha == 0 && !need_flip) {
     __glamor_upload_pixmap_to_texture(pixmap, format, type, pixmap_priv->tex);
     return;
   }
@@ -341,9 +342,9 @@ _glamor_upload_pixmap_to_texture(PixmapPtr pixmap, GLenum format, GLenum type, i
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
   glEnable(GL_TEXTURE_2D);
 #if 0
-  glUseProgram(glamor_priv->finish_access_prog[ax]);
+  glUseProgram(glamor_priv->finish_access_prog[no_alpha]);
 #else
-  glUseProgram(glamor_priv->finish_access_prog[ax + 2]);
+  glUseProgram(glamor_priv->finish_access_prog[no_alpha + 2]);
 #endif
 
   glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
@@ -397,13 +398,13 @@ glamor_pixmap_ensure_fb(PixmapPtr pixmap)
 
 /*  
  * Prepare to upload a pixmap to texture memory.
- * ax 1 means the format needs to wire alpha to 1.
+ * no_alpha equals 1 means the format needs to wire alpha to 1.
  * Two condtion need to setup a fbo for a pixmap
  * 1. !yInverted, we need to do flip if we are not yInverted.
- * 2. ax != 0, we need to wire the alpha.
+ * 2. no_alpha != 0, we need to wire the alpha.
  * */
 static int
-glamor_pixmap_upload_prepare(PixmapPtr pixmap, int ax)
+glamor_pixmap_upload_prepare(PixmapPtr pixmap, int no_alpha)
 {
   int need_fbo;
   glamor_pixmap_private *pixmap_priv = glamor_get_pixmap_private(pixmap);
@@ -419,7 +420,7 @@ glamor_pixmap_upload_prepare(PixmapPtr pixmap, int ax)
   if (GLAMOR_PIXMAP_PRIV_HAS_FBO(pixmap_priv)) 
     return 0; 
 
-  if (ax != 0 || !glamor_priv->yInverted)
+  if (no_alpha != 0 || !glamor_priv->yInverted)
     need_fbo = 1;
   else
     need_fbo = 0;
@@ -444,16 +445,16 @@ enum glamor_pixmap_status
 glamor_upload_pixmap_to_texture(PixmapPtr pixmap)
 {
   GLenum format, type;
-  int ax;
+  int no_alpha;
 
   if (glamor_get_tex_format_type_from_pixmap(pixmap, 
 					     &format, 
 					     &type, 
-					     &ax)) {
+					     &no_alpha)) {
     glamor_fallback("Unknown pixmap depth %d.\n", pixmap->drawable.depth);
     return GLAMOR_UPLOAD_FAILED;
   }
-  if (glamor_pixmap_upload_prepare(pixmap, ax))
+  if (glamor_pixmap_upload_prepare(pixmap, no_alpha))
     return GLAMOR_UPLOAD_FAILED;
   glamor_debug_output(GLAMOR_DEBUG_TEXTURE_DYNAMIC_UPLOAD,
 		      "Uploading pixmap %p  %dx%d depth%d.\n", 
@@ -461,7 +462,7 @@ glamor_upload_pixmap_to_texture(PixmapPtr pixmap)
 		      pixmap->drawable.width, 
 		      pixmap->drawable.height,
 		      pixmap->drawable.depth);
-  _glamor_upload_pixmap_to_texture(pixmap, format, type, ax, 1);
+  _glamor_upload_pixmap_to_texture(pixmap, format, type, no_alpha, 1);
   return GLAMOR_UPLOAD_DONE;
 }
 
@@ -485,16 +486,16 @@ void
 glamor_restore_pixmap_to_texture(PixmapPtr pixmap)
 {
   GLenum format, type;
-  int ax;
+  int no_alpha;
 
   if (glamor_get_tex_format_type_from_pixmap(pixmap, 
 					     &format, 
 					     &type, 
-					     &ax)) {
+					     &no_alpha)) {
     ErrorF("Unknown pixmap depth %d.\n", pixmap->drawable.depth);
     assert(0);
   }
-  _glamor_upload_pixmap_to_texture(pixmap, format, type, ax, 1);
+  _glamor_upload_pixmap_to_texture(pixmap, format, type, no_alpha, 1);
 }
 
 
@@ -514,7 +515,7 @@ glamor_download_pixmap_to_cpu(PixmapPtr pixmap, glamor_access_t access)
   glamor_pixmap_private *pixmap_priv = glamor_get_pixmap_private(pixmap);
   unsigned int stride, row_length, y;
   GLenum format, type, gl_access, gl_usage;
-  int ax;
+  int no_alpha;
   uint8_t *data, *read;
   glamor_screen_private *glamor_priv =
     glamor_get_screen_private(pixmap->drawable.pScreen);
@@ -522,12 +523,10 @@ glamor_download_pixmap_to_cpu(PixmapPtr pixmap, glamor_access_t access)
 
   if (!GLAMOR_PIXMAP_PRIV_HAS_FBO(pixmap_priv))
     return TRUE;
-  /* XXX we may don't need to validate it on GPU here,
-   * we can just validate it on CPU. */
   if (glamor_get_tex_format_type_from_pixmap(pixmap, 
 					     &format,
 					     &type, 
-					     &ax)) {
+					     &no_alpha)) {
     ErrorF("Unknown pixmap depth %d.\n", pixmap->drawable.depth);
     assert(0);  // Should never happen.
     return FALSE;
@@ -543,6 +542,8 @@ glamor_download_pixmap_to_cpu(PixmapPtr pixmap, glamor_access_t access)
  
   stride = pixmap->devKind;
   glamor_set_destination_pixmap_priv_nc(pixmap_priv);
+  /* XXX we may don't need to validate it on GPU here,
+   * we can just validate it on CPU. */
   glamor_validate_pixmap(pixmap); 
   switch (access) {
   case GLAMOR_ACCESS_RO:
diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h
index 69590a5c5..2c2bf22d2 100644
--- a/glamor/glamor_priv.h
+++ b/glamor/glamor_priv.h
@@ -404,7 +404,7 @@ format_for_pixmap(PixmapPtr pixmap)
 
 /*
  * Map picture's format to the correct gl texture format and type.
- * xa is used to indicate whehter we need to wire alpha to 1. 
+ * no_alpha is used to indicate whehter we need to wire alpha to 1. 
  *
  * Return 0 if find a matched texture type. Otherwise return -1.
  **/
@@ -412,41 +412,41 @@ static inline int
 glamor_get_tex_format_type_from_pictformat(PictFormatShort format,
 					   GLenum *tex_format, 
 					   GLenum *tex_type,
-					   int *xa)
+					   int *no_alpha)
 {
-  *xa = 0;
+  *no_alpha = 0;
   switch (format) {
   case PICT_a1:
     *tex_format = GL_COLOR_INDEX;
     *tex_type = GL_BITMAP;
     break;
   case PICT_b8g8r8x8:
-    *xa = 1;
+    *no_alpha = 1;
   case PICT_b8g8r8a8:
     *tex_format = GL_BGRA;
     *tex_type = GL_UNSIGNED_INT_8_8_8_8;
     break;
 
   case PICT_x8r8g8b8:
-    *xa = 1;
+    *no_alpha = 1;
   case PICT_a8r8g8b8:
     *tex_format = GL_BGRA;
     *tex_type = GL_UNSIGNED_INT_8_8_8_8_REV;
     break;
   case PICT_x8b8g8r8:
-    *xa = 1;
+    *no_alpha = 1;
   case PICT_a8b8g8r8:
     *tex_format = GL_RGBA;
     *tex_type = GL_UNSIGNED_INT_8_8_8_8_REV;
     break;
   case PICT_x2r10g10b10:
-    *xa = 1;
+    *no_alpha = 1;
   case PICT_a2r10g10b10:
     *tex_format = GL_BGRA;
     *tex_type = GL_UNSIGNED_INT_2_10_10_10_REV;
     break;
   case PICT_x2b10g10r10:
-    *xa = 1;
+    *no_alpha = 1;
   case PICT_a2b10g10r10:
     *tex_format = GL_RGBA;
     *tex_type = GL_UNSIGNED_INT_2_10_10_10_REV;
@@ -461,14 +461,14 @@ glamor_get_tex_format_type_from_pictformat(PictFormatShort format,
     *tex_type = GL_UNSIGNED_SHORT_5_6_5_REV;
     break;
   case PICT_x1b5g5r5:
-    *xa = 1;
+    *no_alpha = 1;
   case PICT_a1b5g5r5:
     *tex_format = GL_RGBA;
     *tex_type = GL_UNSIGNED_SHORT_1_5_5_5_REV;
     break;
                
   case PICT_x1r5g5b5:
-    *xa = 1;
+    *no_alpha = 1;
   case PICT_a1r5g5b5:
     *tex_format = GL_BGRA;
     *tex_type = GL_UNSIGNED_SHORT_1_5_5_5_REV;
@@ -478,14 +478,14 @@ glamor_get_tex_format_type_from_pictformat(PictFormatShort format,
     *tex_type = GL_UNSIGNED_BYTE;
     break;
   case PICT_x4r4g4b4:
-    *xa = 1;
+    *no_alpha = 1;
   case PICT_a4r4g4b4:
     *tex_format = GL_BGRA;
     *tex_type = GL_UNSIGNED_SHORT_4_4_4_4_REV;
     break;
 
   case PICT_x4b4g4r4:
-    *xa = 1;
+    *no_alpha = 1;
   case PICT_a4b4g4r4:
     *tex_format = GL_RGBA;
     *tex_type = GL_UNSIGNED_SHORT_4_4_4_4_REV;
diff --git a/glamor/glamor_putimage.c b/glamor/glamor_putimage.c
index a6aadce11..38da796af 100644
--- a/glamor/glamor_putimage.c
+++ b/glamor/glamor_putimage.c
@@ -265,7 +265,7 @@ glamor_put_image(DrawablePtr drawable, GCPtr gc, int depth, int x, int y,
     float vertices[8], texcoords[8];
     GLfloat xscale, yscale, txscale, tyscale;
     GLuint tex;
-    int ax = 0;
+    int no_alpha;
     if (image_format == XYBitmap) {
 	assert(depth == 1);
         goto fail;
@@ -290,7 +290,7 @@ glamor_put_image(DrawablePtr drawable, GCPtr gc, int depth, int x, int y,
     if (glamor_get_tex_format_type_from_pixmap(pixmap,
                                                &format, 
                                                &type, 
-                                               &ax
+                                               &no_alpha
                                                )) {
       glamor_fallback("unknown depth. %d \n", 
                      drawable->depth);
@@ -347,9 +347,9 @@ glamor_put_image(DrawablePtr drawable, GCPtr gc, int depth, int x, int y,
     glEnable(GL_TEXTURE_2D);
 
 #if 0
-    glUseProgram(glamor_priv->finish_access_prog[ax]);
+    glUseProgram(glamor_priv->finish_access_prog[no_alpha]);
 #else
-    glUseProgram(glamor_priv->finish_access_prog[ax + 2]);
+    glUseProgram(glamor_priv->finish_access_prog[no_alpha + 2]);
 #endif
 
     x += drawable->x;
diff --git a/glamor/glamor_setspans.c b/glamor/glamor_setspans.c
index af2664301..d08be135f 100644
--- a/glamor/glamor_setspans.c
+++ b/glamor/glamor_setspans.c
@@ -37,18 +37,19 @@ glamor_set_spans(DrawablePtr drawable, GCPtr gc, char *src,
 {
     PixmapPtr dest_pixmap = glamor_get_drawable_pixmap(drawable);
     GLenum format, type;
-    int ax, i;
+    int no_alpha, i;
     uint8_t *drawpixels_src = (uint8_t *)src;
     RegionPtr clip = fbGetCompositeClip(gc);
     BoxRec *pbox;
     int x_off, y_off;
 
+
     goto fail;
 
     if (glamor_get_tex_format_type_from_pixmap(dest_pixmap,
                                                &format, 
                                                &type, 
-                                               &ax
+                                               &no_alpha
                                                )) {
       glamor_fallback("unknown depth. %d \n", 
                      drawable->depth);