i965/miptree: Rename align_w,align_h -> halign,valign

The values of intel_mipmap_tree::align_w and ::align_h correspond to the
hardware enums HALIGN_* and VALIGN_*.

See the confusion?
    align_h != HALIGN
    align_h == VALIGN

Reduce the confusion by renaming the variables to match the hardware
enum names:
    git ls-files |
    xargs sed -i -e 's/align_w/halign/g' \
                 -e 's/align_h/valign/g'

Suggested-by: Kenneth Graunke <kenneth@whitecape.org>
Acked-by: Ben Widawsky <benjamin.widawsky@intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>

1 files changed, 14 insertions, 4 deletions

diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.h b/src/mesa/drivers/dri/i965/intel_mipmap_tree.h
index eba7203..e4acf8b 100644
--- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.h
+++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.h
@@ -371,11 +371,21 @@ struct intel_mipmap_tree
    mesa_format etc_format;
 
    /**
-    * The X offset of each image in the miptree must be aligned to this.
-    * See the comments in brw_tex_layout.c.
+    * @name Surface Alignment
+    * @{
+    *
+    * This defines the alignment of the upperleft pixel of each 2D subimage
+    * contained in the surface. The alignment is in pixel coordinates relative
+    * to the surface's most upperleft pixel, which is the pixel at (x=0, y=0,
+    * layer=0, level=0).
+    *
+    * In the surface layout equations found in the hardware docs, the
+    * horizontal and vertical surface alignments often appear as variables 'i'
+    * and 'j'.
     */
-   unsigned int align_w;
-   unsigned int align_h; /**< \see align_w */
+   uint32_t halign; /**< RENDER_SURFACE_STATE.SurfaceHorizontalAlignment */
+   uint32_t valign; /**< RENDER_SURFACE_STATE.SurfaceVerticalAlignment */
+   /** @} */
 
    GLuint first_level;
    GLuint last_level;