diff --git a/src/intel/decoder/intel_decoder.c b/src/intel/decoder/intel_decoder.c index 742460dde63..e037185a6b8 100644 --- a/src/intel/decoder/intel_decoder.c +++ b/src/intel/decoder/intel_decoder.c @@ -879,7 +879,7 @@ get_embedded_xml_data_by_name(const char *filename, { "gen120.xml", 120 }, { "gen125.xml", 125 }, { "xe2.xml", 200 }, - { "gen300.xml", 300 }, + { "xe3.xml", 300 }, }; int num = -1; diff --git a/src/intel/genxml/genX_cl_pack.h b/src/intel/genxml/genX_cl_pack.h index 8111ba9d1aa..a3b60c04abf 100644 --- a/src/intel/genxml/genX_cl_pack.h +++ b/src/intel/genxml/genX_cl_pack.h @@ -34,7 +34,7 @@ #elif (GFX_VERx10 == 200) # include "genxml/xe2_cl_pack.h" #elif (GFX_VERx10 == 300) -# include "genxml/gen300_cl_pack.h" +# include "genxml/xe3_cl_pack.h" #else # error "Need to add a pack header include for this gen" #endif diff --git a/src/intel/genxml/genX_pack.h b/src/intel/genxml/genX_pack.h index bb3b89011c5..8779df3febc 100644 --- a/src/intel/genxml/genX_pack.h +++ b/src/intel/genxml/genX_pack.h @@ -53,7 +53,7 @@ #elif (GFX_VERx10 == 200) # include "genxml/xe2_pack.h" #elif (GFX_VERx10 == 300) -# include "genxml/gen300_pack.h" +# include "genxml/xe3_pack.h" #else # error "Need to add a pack header include for this gen" #endif diff --git a/src/intel/genxml/genX_rt_pack.h b/src/intel/genxml/genX_rt_pack.h index b969064f7da..3e915ed063c 100644 --- a/src/intel/genxml/genX_rt_pack.h +++ b/src/intel/genxml/genX_rt_pack.h @@ -35,7 +35,7 @@ #elif (GFX_VERx10 == 200) # include "genxml/xe2_rt_pack.h" #elif (GFX_VERx10 == 300) -# include "genxml/gen300_rt_pack.h" +# include "genxml/xe3_rt_pack.h" #else # error "Need to add a pack header include for this gen" #endif diff --git a/src/intel/genxml/genX_video_pack.h b/src/intel/genxml/genX_video_pack.h index 5a22a3dab43..0c1cc89cb15 100644 --- a/src/intel/genxml/genX_video_pack.h +++ b/src/intel/genxml/genX_video_pack.h @@ -53,7 +53,7 @@ #elif (GFX_VERx10 == 200) # include "genxml/xe2_video_pack.h" #elif (GFX_VERx10 == 300) -# include "genxml/gen300_video_pack.h" +# include "genxml/xe3_video_pack.h" #else # error "Need to add a pack header include for this gen" #endif diff --git a/src/intel/genxml/intel_genxml.py b/src/intel/genxml/intel_genxml.py index 4ce4530cdd9..88f36037150 100755 --- a/src/intel/genxml/intel_genxml.py +++ b/src/intel/genxml/intel_genxml.py @@ -207,8 +207,8 @@ default_imports = OrderedDict([ ('gen125.xml', ('gen120.xml',)), ('xe2.xml', ('gen125.xml',)), ('xe2_rt.xml', ('gen125_rt.xml',)), - ('gen300.xml', ('xe2.xml',)), - ('gen300_rt.xml', ('xe2_rt.xml',)), + ('xe3.xml', ('xe2.xml',)), + ('xe3_rt.xml', ('xe2_rt.xml',)), ]) known_genxml_files = list(default_imports.keys()) diff --git a/src/intel/genxml/meson.build b/src/intel/genxml/meson.build index c6a3eb4bec4..9a6104adaf6 100644 --- a/src/intel/genxml/meson.build +++ b/src/intel/genxml/meson.build @@ -14,13 +14,13 @@ gen_xml_files = [ 'gen120.xml', 'gen125.xml', 'xe2.xml', - 'gen300.xml', + 'xe3.xml', ] gen_xml_rt_files = [ 'gen125_rt.xml', 'xe2_rt.xml', - 'gen300_rt.xml', + 'xe3_rt.xml', ] gen_pack_header_deps = files('intel_genxml.py', 'util.py') diff --git a/src/intel/genxml/gen300.xml b/src/intel/genxml/xe3.xml similarity index 100% rename from src/intel/genxml/gen300.xml rename to src/intel/genxml/xe3.xml diff --git a/src/intel/genxml/gen300_rt.xml b/src/intel/genxml/xe3_rt.xml similarity index 100% rename from src/intel/genxml/gen300_rt.xml rename to src/intel/genxml/xe3_rt.xml