From bda43a0f59e5f5877c10b2ce6727fba99d486d37 Mon Sep 17 00:00:00 2001
From: Chad Versace <chad.versace@intel.com>
Date: Wed, 2 Dec 2015 09:14:48 -0800
Subject: [PATCH] isl: Rename legacy Y tiling to ISL_TILING_Y0

Rename legacy Y tiling from ISL_TILING_Y to ISL_TILING_Y0 in order to
clearly distinguish it from Yf and Ys.  Using ISL_TILING_Y to denote
legacy Y tiling would lead to confusion with i965, because i965 uses
I195_TILE_Y to denote *any* Y tiling.
---
 src/vulkan/anv_image.c  | 4 ++--
 src/vulkan/gen7_state.c | 2 +-
 src/vulkan/gen8_state.c | 2 +-
 src/vulkan/isl.c        | 4 ++--
 src/vulkan/isl.h        | 5 ++++-
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/vulkan/anv_image.c b/src/vulkan/anv_image.c
index 157357ea74d..7abd0db1460 100644
--- a/src/vulkan/anv_image.c
+++ b/src/vulkan/anv_image.c
@@ -100,7 +100,7 @@ static const struct anv_tile_info {
 } anv_tile_info_table[] = {
    [ISL_TILING_LINEAR]  = {   64 },
    [ISL_TILING_X]       = { 4096 },
-   [ISL_TILING_Y]       = { 4096 },
+   [ISL_TILING_Y0]      = { 4096 },
    [ISL_TILING_Yf]      = { 4096 },
    [ISL_TILING_Ys]      = { 4096 },
    [ISL_TILING_W]       = { 4096 },
@@ -124,7 +124,7 @@ anv_image_choose_tiling(const struct anv_image_create_info *anv_info)
       if (unlikely(anv_info->vk_info->format == VK_FORMAT_S8_UINT)) {
          return ISL_TILING_W;
       } else {
-         return ISL_TILING_Y;
+         return ISL_TILING_Y0;
       }
    default:
       assert(!"bad VKImageTiling");
diff --git a/src/vulkan/gen7_state.c b/src/vulkan/gen7_state.c
index a3cb95dbb52..5a626f75eeb 100644
--- a/src/vulkan/gen7_state.c
+++ b/src/vulkan/gen7_state.c
@@ -249,7 +249,7 @@ genX(image_view_init)(struct anv_image_view *iview,
        * Tiled Surface is False."
        */
       .TiledSurface = surface->tiling != ISL_TILING_LINEAR,
-      .TileWalk = surface->tiling == ISL_TILING_Y ?
+      .TileWalk = surface->tiling == ISL_TILING_Y0 ?
                   TILEWALK_YMAJOR : TILEWALK_XMAJOR,
 
       .VerticalLineStride = 0,
diff --git a/src/vulkan/gen8_state.c b/src/vulkan/gen8_state.c
index c1e0504a15b..f46611c629d 100644
--- a/src/vulkan/gen8_state.c
+++ b/src/vulkan/gen8_state.c
@@ -177,7 +177,7 @@ genX(image_view_init)(struct anv_image_view *iview,
    static const uint8_t isl_to_gen_tiling[] = {
       [ISL_TILING_LINEAR]  = LINEAR,
       [ISL_TILING_X]       = XMAJOR,
-      [ISL_TILING_Y]       = YMAJOR,
+      [ISL_TILING_Y0]      = YMAJOR,
       [ISL_TILING_Yf]      = YMAJOR,
       [ISL_TILING_Ys]      = YMAJOR,
       [ISL_TILING_W]       = WMAJOR,
diff --git a/src/vulkan/isl.c b/src/vulkan/isl.c
index ebfd2bfb104..65b696a1003 100644
--- a/src/vulkan/isl.c
+++ b/src/vulkan/isl.c
@@ -56,7 +56,7 @@ isl_tiling_get_extent(const struct isl_device *dev,
    static const struct isl_extent2d legacy_extents[] = {
       [ISL_TILING_LINEAR]  = {   1,   1 },
       [ISL_TILING_X]       = { 512,   8 },
-      [ISL_TILING_Y]       = { 128,  32 },
+      [ISL_TILING_Y0]      = { 128,  32 },
       [ISL_TILING_W]       = { 128,  32 },
    };
 
@@ -74,7 +74,7 @@ isl_tiling_get_extent(const struct isl_device *dev,
    switch (tiling) {
    case ISL_TILING_LINEAR:
    case ISL_TILING_X:
-   case ISL_TILING_Y:
+   case ISL_TILING_Y0:
    case ISL_TILING_W:
       *e = legacy_extents[tiling];
       return;
diff --git a/src/vulkan/isl.h b/src/vulkan/isl.h
index fb0b6f4a75c..fd6b1c2b5ad 100644
--- a/src/vulkan/isl.h
+++ b/src/vulkan/isl.h
@@ -40,12 +40,15 @@ struct brw_device_info;
 /**
  * WARNING: These values differ from the hardware enum values, which are
  * unstable across hardware generations.
+ *
+ * Note that legacy Y tiling is ISL_TILING_Y0 instead of ISL_TILING_Y, to
+ * clearly distinguish it from Yf and Ys.
  */
 enum isl_tiling {
    ISL_TILING_LINEAR,
    ISL_TILING_W,
    ISL_TILING_X,
-   ISL_TILING_Y, /**< Legacy Y tiling */
+   ISL_TILING_Y0, /**< Legacy Y tiling */
    ISL_TILING_Yf,
    ISL_TILING_Ys,
 };
-- 
2.30.2