Mesa (main): intel/isl: replace format_gen by verx10

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 7e6a7dba1e0590c95152863d798d10977a851bff
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7e6a7dba1e0590c95152863d798d10977a851bff

Author: Marcin Ślusarz <marcin.slusarz at intel.com>
Date:   Fri May 14 18:45:52 2021 +0200

intel/isl: replace format_gen by verx10

Signed-off-by: Marcin Ślusarz <marcin.slusarz at intel.com>
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10810>

---

 src/intel/isl/isl_format.c | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/intel/isl/isl_format.c b/src/intel/isl/isl_format.c
index 3022044c673..f3bbfd9d37f 100644
--- a/src/intel/isl/isl_format.c
+++ b/src/intel/isl/isl_format.c
@@ -674,12 +674,6 @@ isl_format_for_pipe_format(enum pipe_format pf)
    return table[pf];
 }
 
-static unsigned
-format_gen(const struct intel_device_info *devinfo)
-{
-   return devinfo->ver * 10 + (devinfo->is_g4x || devinfo->is_haswell) * 5;
-}
-
 static bool
 format_info_exists(enum isl_format format)
 {
@@ -695,7 +689,7 @@ isl_format_supports_rendering(const struct intel_device_info *devinfo,
    if (!format_info_exists(format))
       return false;
 
-   return format_gen(devinfo) >= format_info[format].render_target;
+   return devinfo->verx10 >= format_info[format].render_target;
 }
 
 bool
@@ -705,7 +699,7 @@ isl_format_supports_alpha_blending(const struct intel_device_info *devinfo,
    if (!format_info_exists(format))
       return false;
 
-   return format_gen(devinfo) >= format_info[format].alpha_blend;
+   return devinfo->verx10 >= format_info[format].alpha_blend;
 }
 
 bool
@@ -738,7 +732,7 @@ isl_format_supports_sampling(const struct intel_device_info *devinfo,
          return true;
    }
 
-   return format_gen(devinfo) >= format_info[format].sampling;
+   return devinfo->verx10 >= format_info[format].sampling;
 }
 
 bool
@@ -771,7 +765,7 @@ isl_format_supports_filtering(const struct intel_device_info *devinfo,
          return true;
    }
 
-   return format_gen(devinfo) >= format_info[format].filtering;
+   return devinfo->verx10 >= format_info[format].filtering;
 }
 
 bool
@@ -787,7 +781,7 @@ isl_format_supports_vertex_fetch(const struct intel_device_info *devinfo,
    if (devinfo->is_baytrail)
       return 75 >= format_info[format].input_vb;
 
-   return format_gen(devinfo) >= format_info[format].input_vb;
+   return devinfo->verx10 >= format_info[format].input_vb;
 }
 
 /**
@@ -800,7 +794,7 @@ isl_format_supports_typed_writes(const struct intel_device_info *devinfo,
    if (!format_info_exists(format))
       return false;
 
-   return format_gen(devinfo) >= format_info[format].typed_write;
+   return devinfo->verx10 >= format_info[format].typed_write;
 }
 
 
@@ -821,7 +815,7 @@ isl_format_supports_typed_reads(const struct intel_device_info *devinfo,
    if (!format_info_exists(format))
       return false;
 
-   return format_gen(devinfo) >= format_info[format].typed_read;
+   return devinfo->verx10 >= format_info[format].typed_read;
 }
 
 /**
@@ -874,7 +868,7 @@ isl_format_supports_ccs_e(const struct intel_device_info *devinfo,
    if (format == ISL_FORMAT_R11G11B10_FLOAT)
       return false;
 
-   return format_gen(devinfo) >= format_info[format].ccs_e;
+   return devinfo->verx10 >= format_info[format].ccs_e;
 }
 
 bool