intel/isl: Build gen12 using gen11 code paths

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>

diff --git a/src/intel/Makefile.sources b/src/intel/Makefile.sources
index 79f86a59806a0fc21051a4d6d5d2d441c7b22b4e..43937811ea86f7ad20fd39ecb3f987d08be2a85a 100644 (file)
--- a/src/intel/Makefile.sources
+++ b/src/intel/Makefile.sources
@@ -219,6 +219,10 @@ ISL_GEN11_FILES = \
        isl/isl_emit_depth_stencil.c \
        isl/isl_surface_state.c
 
+ISL_GEN12_FILES = \
+       isl/isl_emit_depth_stencil.c \
+       isl/isl_surface_state.c
+
 ISL_GENERATED_FILES = \
        isl/isl_format_layout.c
 

diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c
index 1b033cb6aac8f2c65dbaa76c79e5a945b9d35556..a647bf0d8143d54e47144c732047afe7db3df1e1 100644 (file)
--- a/src/intel/isl/isl.c
+++ b/src/intel/isl/isl.c
@@ -1900,6 +1900,9 @@ isl_surf_get_ccs_surf(const struct isl_device *dev,
    case 11:                                        \
       isl_gen11_##func(__VA_ARGS__);               \
       break;                                       \
+   case 12:                                        \
+      isl_gen12_##func(__VA_ARGS__);               \
+      break;                                       \
    default:                                        \
       assert(!"Unknown hardware generation");      \
    }

diff --git a/src/intel/isl/isl_priv.h b/src/intel/isl/isl_priv.h
index 993ae13473d1641042ed53f2578085aefdd758ea..710c5222ba18883fb934ccba0cafb9782d8af94b 100644 (file)
--- a/src/intel/isl/isl_priv.h
+++ b/src/intel/isl/isl_priv.h
@@ -232,6 +232,9 @@ _isl_memcpy_tiled_to_linear_sse41(uint32_t xt1, uint32_t xt2,
 #  define genX(x) gen11_##x
 #  include "isl_genX_priv.h"
 #  undef genX
+#  define genX(x) gen12_##x
+#  include "isl_genX_priv.h"
+#  undef genX
 #endif
 
 #endif /* ISL_PRIV_H */

diff --git a/src/intel/isl/meson.build b/src/intel/isl/meson.build
index 88070749879df1eedf806a5c3ef5e2e7dbb6e7d0..2e0f65cb670f654ec85eb118e47ad1b9fcf43f2d 100644 (file)
--- a/src/intel/isl/meson.build
+++ b/src/intel/isl/meson.build
@@ -51,7 +51,7 @@ isl_gen9_files = files(
 isl_gen_libs = []
 foreach g : [['40', isl_gen4_files], ['50', []], ['60', isl_gen6_files],
              ['70', isl_gen7_files], ['75', []], ['80', isl_gen8_files],
-             ['90', isl_gen9_files], ['100', []], ['110', []]]
+             ['90', isl_gen9_files], ['100', []], ['110', []], ['120', []]]
   _gen = g[0]
   isl_gen_libs += static_library(
     'isl_gen@0@'.format(_gen),