diff --git a/src/intel/decoder/intel_decoder.c b/src/intel/decoder/intel_decoder.c index 54985a4ddbd..742460dde63 100644 --- a/src/intel/decoder/intel_decoder.c +++ b/src/intel/decoder/intel_decoder.c @@ -878,7 +878,7 @@ get_embedded_xml_data_by_name(const char *filename, { "gen110.xml", 110 }, { "gen120.xml", 120 }, { "gen125.xml", 125 }, - { "gen200.xml", 200 }, + { "xe2.xml", 200 }, { "gen300.xml", 300 }, }; diff --git a/src/intel/genxml/gen300.xml b/src/intel/genxml/gen300.xml index 77ee56e36ce..9b2edcbbc56 100644 --- a/src/intel/genxml/gen300.xml +++ b/src/intel/genxml/gen300.xml @@ -1,6 +1,6 @@ - + diff --git a/src/intel/genxml/gen300_rt.xml b/src/intel/genxml/gen300_rt.xml index 7b2bcff39cb..a06123ecb55 100644 --- a/src/intel/genxml/gen300_rt.xml +++ b/src/intel/genxml/gen300_rt.xml @@ -1,6 +1,6 @@ - + diff --git a/src/intel/genxml/genX_cl_pack.h b/src/intel/genxml/genX_cl_pack.h index ee80d636035..8111ba9d1aa 100644 --- a/src/intel/genxml/genX_cl_pack.h +++ b/src/intel/genxml/genX_cl_pack.h @@ -32,7 +32,7 @@ #elif (GFX_VERx10 == 125) # include "genxml/gen125_cl_pack.h" #elif (GFX_VERx10 == 200) -# include "genxml/gen200_cl_pack.h" +# include "genxml/xe2_cl_pack.h" #elif (GFX_VERx10 == 300) # include "genxml/gen300_cl_pack.h" #else diff --git a/src/intel/genxml/genX_pack.h b/src/intel/genxml/genX_pack.h index d661d6f49e9..bb3b89011c5 100644 --- a/src/intel/genxml/genX_pack.h +++ b/src/intel/genxml/genX_pack.h @@ -51,7 +51,7 @@ #elif (GFX_VERx10 == 125) # include "genxml/gen125_pack.h" #elif (GFX_VERx10 == 200) -# include "genxml/gen200_pack.h" +# include "genxml/xe2_pack.h" #elif (GFX_VERx10 == 300) # include "genxml/gen300_pack.h" #else diff --git a/src/intel/genxml/genX_rt_pack.h b/src/intel/genxml/genX_rt_pack.h index 9e738b5e8e7..b969064f7da 100644 --- a/src/intel/genxml/genX_rt_pack.h +++ b/src/intel/genxml/genX_rt_pack.h @@ -33,7 +33,7 @@ #elif (GFX_VERx10 == 125) # include "genxml/gen125_rt_pack.h" #elif (GFX_VERx10 == 200) -# include "genxml/gen200_rt_pack.h" +# include "genxml/xe2_rt_pack.h" #elif (GFX_VERx10 == 300) # include "genxml/gen300_rt_pack.h" #else diff --git a/src/intel/genxml/genX_video_pack.h b/src/intel/genxml/genX_video_pack.h index ec626a26765..5a22a3dab43 100644 --- a/src/intel/genxml/genX_video_pack.h +++ b/src/intel/genxml/genX_video_pack.h @@ -51,7 +51,7 @@ #elif (GFX_VERx10 == 125) # include "genxml/gen125_video_pack.h" #elif (GFX_VERx10 == 200) -# include "genxml/gen200_video_pack.h" +# include "genxml/xe2_video_pack.h" #elif (GFX_VERx10 == 300) # include "genxml/gen300_video_pack.h" #else diff --git a/src/intel/genxml/intel_genxml.py b/src/intel/genxml/intel_genxml.py index 1e276fcf1cf..4ce4530cdd9 100755 --- a/src/intel/genxml/intel_genxml.py +++ b/src/intel/genxml/intel_genxml.py @@ -205,10 +205,10 @@ default_imports = OrderedDict([ ('gen110.xml', ('gen90.xml',)), ('gen120.xml', ('gen110.xml',)), ('gen125.xml', ('gen120.xml',)), - ('gen200.xml', ('gen125.xml',)), - ('gen200_rt.xml', ('gen125_rt.xml',)), - ('gen300.xml', ('gen200.xml',)), - ('gen300_rt.xml', ('gen200_rt.xml',)), + ('xe2.xml', ('gen125.xml',)), + ('xe2_rt.xml', ('gen125_rt.xml',)), + ('gen300.xml', ('xe2.xml',)), + ('gen300_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 0f1478a28ab..c6a3eb4bec4 100644 --- a/src/intel/genxml/meson.build +++ b/src/intel/genxml/meson.build @@ -13,13 +13,13 @@ gen_xml_files = [ 'gen110.xml', 'gen120.xml', 'gen125.xml', - 'gen200.xml', + 'xe2.xml', 'gen300.xml', ] gen_xml_rt_files = [ 'gen125_rt.xml', - 'gen200_rt.xml', + 'xe2_rt.xml', 'gen300_rt.xml', ] diff --git a/src/intel/genxml/gen200.xml b/src/intel/genxml/xe2.xml similarity index 100% rename from src/intel/genxml/gen200.xml rename to src/intel/genxml/xe2.xml diff --git a/src/intel/genxml/gen200_rt.xml b/src/intel/genxml/xe2_rt.xml similarity index 100% rename from src/intel/genxml/gen200_rt.xml rename to src/intel/genxml/xe2_rt.xml