diff --git a/src/intel/isl/meson.build b/src/intel/isl/meson.build index 430de21aa92..726dc1359b9 100644 --- a/src/intel/isl/meson.build +++ b/src/intel/isl/meson.build @@ -63,15 +63,15 @@ foreach g : [['40', isl_gfx4_files], ['50', []], ['60', isl_gfx6_files], ['70', isl_gfx7_files], ['75', []], ['80', isl_gfx8_files], ['90', isl_gfx9_files], ['110', []], ['120', isl_gfx12_files], ['125', isl_gfx12_files]] - _gen = g[0] + _gfx_ver = g[0] isl_per_hw_ver_libs += static_library( - 'isl_per_hw_ver@0@'.format(_gen), + 'isl_per_hw_ver@0@'.format(_gfx_ver), [g[1], isl_per_hw_ver_files, gen_xml_pack], include_directories : [inc_include, inc_src, inc_gallium, inc_intel], dependencies : idep_mesautil, c_args : [ no_override_init_args, - '-DGFX_VERx10=@0@'.format(_gen) + '-DGFX_VERx10=@0@'.format(_gfx_ver) ], gnu_symbol_visibility : 'hidden', ) diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build index 7b0167b3f3c..954bf903fee 100644 --- a/src/intel/vulkan/meson.build +++ b/src/intel/vulkan/meson.build @@ -62,16 +62,16 @@ foreach g : [['70', ['gfx7_cmd_buffer.c']], ['75', ['gfx7_cmd_buffer.c']], ['80', ['gfx8_cmd_buffer.c']], ['90', ['gfx8_cmd_buffer.c']], ['110', ['gfx8_cmd_buffer.c']], ['120', ['gfx8_cmd_buffer.c']], ['125', ['gfx8_cmd_buffer.c']]] - _gen = g[0] + _gfx_ver = g[0] libanv_per_hw_ver_libs += static_library( - 'anv_per_hw_ver@0@'.format(_gen), + 'anv_per_hw_ver@0@'.format(_gfx_ver), [anv_per_hw_ver_files, g[1], anv_entrypoints[0]], include_directories : [ inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_compiler, inc_intel, inc_vulkan_wsi, ], c_args : [ no_override_init_args, c_sse2_args, - '-DGFX_VERx10=@0@'.format(_gen), + '-DGFX_VERx10=@0@'.format(_gfx_ver), ], gnu_symbol_visibility : 'hidden', dependencies : [