i965: rename max_hs_* variables to max_tcs_*

Using consistent naming allows us to create macros more easily.

Reviewed-by: Kenneth Graunke <[email protected]>

2 files changed, 26 insertions, 26 deletions

diff --git a/src/intel/common/gen_device_info.c b/src/intel/common/gen_device_info.c
index 615605c18ba..b12bfad6ea3 100644
--- a/src/intel/common/gen_device_info.c
+++ b/src/intel/common/gen_device_info.c
@@ -118,7 +118,7 @@ static const struct gen_device_info gen_device_info_ivb_gt1 = {
    GEN7_FEATURES, .is_ivybridge = true, .gt = 1,
    .num_slices = 1,
    .max_vs_threads = 36,
-   .max_hs_threads = 36,
+   .max_tcs_threads = 36,
    .max_ds_threads = 36,
    .max_gs_threads = 36,
    .max_wm_threads = 48,
@@ -127,7 +127,7 @@ static const struct gen_device_info gen_device_info_ivb_gt1 = {
       .size = 128,
       .min_vs_entries = 32,
       .max_vs_entries = 512,
-      .max_hs_entries = 32,
+      .max_tcs_entries = 32,
       .min_ds_entries = 10,
       .max_ds_entries = 288,
       .max_gs_entries = 192,
@@ -138,7 +138,7 @@ static const struct gen_device_info gen_device_info_ivb_gt2 = {
    GEN7_FEATURES, .is_ivybridge = true, .gt = 2,
    .num_slices = 1,
    .max_vs_threads = 128,
-   .max_hs_threads = 128,
+   .max_tcs_threads = 128,
    .max_ds_threads = 128,
    .max_gs_threads = 128,
    .max_wm_threads = 172,
@@ -147,7 +147,7 @@ static const struct gen_device_info gen_device_info_ivb_gt2 = {
       .size = 256,
       .min_vs_entries = 32,
       .max_vs_entries = 704,
-      .max_hs_entries = 64,
+      .max_tcs_entries = 64,
       .min_ds_entries = 10,
       .max_ds_entries = 448,
       .max_gs_entries = 320,
@@ -159,7 +159,7 @@ static const struct gen_device_info gen_device_info_byt = {
    .num_slices = 1,
    .has_llc = false,
    .max_vs_threads = 36,
-   .max_hs_threads = 36,
+   .max_tcs_threads = 36,
    .max_ds_threads = 36,
    .max_gs_threads = 36,
    .max_wm_threads = 48,
@@ -168,7 +168,7 @@ static const struct gen_device_info gen_device_info_byt = {
       .size = 128,
       .min_vs_entries = 32,
       .max_vs_entries = 512,
-      .max_hs_entries = 32,
+      .max_tcs_entries = 32,
       .min_ds_entries = 10,
       .max_ds_entries = 288,
       .max_gs_entries = 192,
@@ -185,7 +185,7 @@ static const struct gen_device_info gen_device_info_hsw_gt1 = {
    HSW_FEATURES, .gt = 1,
    .num_slices = 1,
    .max_vs_threads = 70,
-   .max_hs_threads = 70,
+   .max_tcs_threads = 70,
    .max_ds_threads = 70,
    .max_gs_threads = 70,
    .max_wm_threads = 102,
@@ -194,7 +194,7 @@ static const struct gen_device_info gen_device_info_hsw_gt1 = {
       .size = 128,
       .min_vs_entries = 32,
       .max_vs_entries = 640,
-      .max_hs_entries = 64,
+      .max_tcs_entries = 64,
       .min_ds_entries = 10,
       .max_ds_entries = 384,
       .max_gs_entries = 256,
@@ -205,7 +205,7 @@ static const struct gen_device_info gen_device_info_hsw_gt2 = {
    HSW_FEATURES, .gt = 2,
    .num_slices = 1,
    .max_vs_threads = 280,
-   .max_hs_threads = 256,
+   .max_tcs_threads = 256,
    .max_ds_threads = 280,
    .max_gs_threads = 256,
    .max_wm_threads = 204,
@@ -214,7 +214,7 @@ static const struct gen_device_info gen_device_info_hsw_gt2 = {
       .size = 256,
       .min_vs_entries = 64,
       .max_vs_entries = 1664,
-      .max_hs_entries = 128,
+      .max_tcs_entries = 128,
       .min_ds_entries = 10,
       .max_ds_entries = 960,
       .max_gs_entries = 640,
@@ -225,7 +225,7 @@ static const struct gen_device_info gen_device_info_hsw_gt3 = {
    HSW_FEATURES, .gt = 3,
    .num_slices = 2,
    .max_vs_threads = 280,
-   .max_hs_threads = 256,
+   .max_tcs_threads = 256,
    .max_ds_threads = 280,
    .max_gs_threads = 256,
    .max_wm_threads = 408,
@@ -234,7 +234,7 @@ static const struct gen_device_info gen_device_info_hsw_gt3 = {
       .size = 512,
       .min_vs_entries = 64,
       .max_vs_entries = 1664,
-      .max_hs_entries = 128,
+      .max_tcs_entries = 128,
       .min_ds_entries = 10,
       .max_ds_entries = 960,
       .max_gs_entries = 640,
@@ -251,7 +251,7 @@ static const struct gen_device_info gen_device_info_hsw_gt3 = {
    .supports_simd16_3src = true,                    \
    .has_surface_tile_offset = true,                 \
    .max_vs_threads = 504,                           \
-   .max_hs_threads = 504,                           \
+   .max_tcs_threads = 504,                          \
    .max_ds_threads = 504,                           \
    .max_gs_threads = 504,                           \
    .max_wm_threads = 384
@@ -264,7 +264,7 @@ static const struct gen_device_info gen_device_info_bdw_gt1 = {
       .size = 192,
       .min_vs_entries = 64,
       .max_vs_entries = 2560,
-      .max_hs_entries = 504,
+      .max_tcs_entries = 504,
       .min_ds_entries = 34,
       .max_ds_entries = 1536,
       .max_gs_entries = 960,
@@ -279,7 +279,7 @@ static const struct gen_device_info gen_device_info_bdw_gt2 = {
       .size = 384,
       .min_vs_entries = 64,
       .max_vs_entries = 2560,
-      .max_hs_entries = 504,
+      .max_tcs_entries = 504,
       .min_ds_entries = 34,
       .max_ds_entries = 1536,
       .max_gs_entries = 960,
@@ -294,7 +294,7 @@ static const struct gen_device_info gen_device_info_bdw_gt3 = {
       .size = 384,
       .min_vs_entries = 64,
       .max_vs_entries = 2560,
-      .max_hs_entries = 504,
+      .max_tcs_entries = 504,
       .min_ds_entries = 34,
       .max_ds_entries = 1536,
       .max_gs_entries = 960,
@@ -306,7 +306,7 @@ static const struct gen_device_info gen_device_info_chv = {
    .has_llc = false,
    .num_slices = 1,
    .max_vs_threads = 80,
-   .max_hs_threads = 80,
+   .max_tcs_threads = 80,
    .max_ds_threads = 80,
    .max_gs_threads = 80,
    .max_wm_threads = 128,
@@ -315,7 +315,7 @@ static const struct gen_device_info gen_device_info_chv = {
       .size = 192,
       .min_vs_entries = 34,
       .max_vs_entries = 640,
-      .max_hs_entries = 80,
+      .max_tcs_entries = 80,
       .min_ds_entries = 34,
       .max_ds_entries = 384,
       .max_gs_entries = 256,
@@ -333,7 +333,7 @@ static const struct gen_device_info gen_device_info_chv = {
    .has_surface_tile_offset = true,                 \
    .max_vs_threads = 336,                           \
    .max_gs_threads = 336,                           \
-   .max_hs_threads = 336,                           \
+   .max_tcs_threads = 336,                          \
    .max_ds_threads = 336,                           \
    .max_wm_threads = 64 * 9,                        \
    .max_cs_threads = 56,                            \
@@ -341,7 +341,7 @@ static const struct gen_device_info gen_device_info_chv = {
       .size = 384,                                  \
       .min_vs_entries = 64,                         \
       .max_vs_entries = 1856,                       \
-      .max_hs_entries = 672,                        \
+      .max_tcs_entries = 672,                       \
       .min_ds_entries = 34,                         \
       .max_ds_entries = 1120,                       \
       .max_gs_entries = 640,                        \
@@ -385,7 +385,7 @@ static const struct gen_device_info gen_device_info_bxt = {
 
    .num_slices = 1,
    .max_vs_threads = 112,
-   .max_hs_threads = 112,
+   .max_tcs_threads = 112,
    .max_ds_threads = 112,
    .max_gs_threads = 112,
    .max_wm_threads = 64 * 3,
@@ -394,7 +394,7 @@ static const struct gen_device_info gen_device_info_bxt = {
       .size = 192,
       .min_vs_entries = 34,
       .max_vs_entries = 704,
-      .max_hs_entries = 256,
+      .max_tcs_entries = 256,
       .max_ds_entries = 416,
       .max_gs_entries = 256,
    }
@@ -408,7 +408,7 @@ static const struct gen_device_info gen_device_info_bxt_2x6 = {
 
    .num_slices = 1,
    .max_vs_threads = 56, /* XXX: guess */
-   .max_hs_threads = 56, /* XXX: guess */
+   .max_tcs_threads = 56, /* XXX: guess */
    .max_ds_threads = 56,
    .max_gs_threads = 56,
    .max_wm_threads = 64 * 2,
@@ -417,7 +417,7 @@ static const struct gen_device_info gen_device_info_bxt_2x6 = {
       .size = 128,
       .min_vs_entries = 34,
       .max_vs_entries = 352,
-      .max_hs_entries = 128,
+      .max_tcs_entries = 128,
       .max_ds_entries = 208,
       .max_gs_entries = 128,
    }
diff --git a/src/intel/common/gen_device_info.h b/src/intel/common/gen_device_info.h
index 8b68a011ea4..40258d4239f 100644
--- a/src/intel/common/gen_device_info.h
+++ b/src/intel/common/gen_device_info.h
@@ -94,7 +94,7 @@ struct gen_device_info
     */
    unsigned num_slices;
    unsigned max_vs_threads;   /**< Maximum Vertex Shader threads */
-   unsigned max_hs_threads;   /**< Maximum Hull Shader threads */
+   unsigned max_tcs_threads;  /**< Maximum Hull Shader threads */
    unsigned max_ds_threads;   /**< Maximum Domain Shader threads */
    unsigned max_gs_threads;   /**< Maximum Geometry Shader threads. */
    /**
@@ -135,7 +135,7 @@ struct gen_device_info
       unsigned size;
       unsigned min_vs_entries;
       unsigned max_vs_entries;
-      unsigned max_hs_entries;
+      unsigned max_tcs_entries;
       unsigned min_ds_entries;
       unsigned max_ds_entries;
       unsigned max_gs_entries;