fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-03-06 20:50:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

hasvk: remove entrypoints for gfx9+

Browse source 
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Acked-by: Jason Ekstrand <jason.ekstrand@collabora.com>
Acked-by: Jason Ekstrand <jason@jlekstrand.net>
Acked-by: Jason Ekstrand <jason.ekstrand@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18208>
This commit is contained in:
Lionel Landwerlin 2022-08-03 11:59:26 +03:00 • committed by Marge Bot
parent 50013ca9a5
commit daf108ee14
4 changed files with 5 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/intel/vulkan_hasvk/anv_blorp.c
View file

@ -105,18 +105,6 @@ anv_device_init_blorp(struct anv_device *device)
case 80:
device->blorp.exec = gfx8_blorp_exec;
break;
case 90:
device->blorp.exec = gfx9_blorp_exec;
break;
case 110:
device->blorp.exec = gfx11_blorp_exec;
break;
case 120:
device->blorp.exec = gfx12_blorp_exec;
break;
case 125:
device->blorp.exec = gfx125_blorp_exec;
break;
default:
unreachable("Unknown hardware generation");
}

12
src/intel/vulkan_hasvk/anv_measure.c
View file

@ -39,18 +39,6 @@ void
anv_measure_device_init(struct anv_physical_device *device)
{
switch (device->info.verx10) {
case 125:
device->cmd_emit_timestamp = &gfx125_cmd_emit_timestamp;
break;
case 120:
device->cmd_emit_timestamp = &gfx12_cmd_emit_timestamp;
break;
case 110:
device->cmd_emit_timestamp = &gfx11_cmd_emit_timestamp;
break;
case 90:
device->cmd_emit_timestamp = &gfx9_cmd_emit_timestamp;
break;
case 80:
device->cmd_emit_timestamp = &gfx8_cmd_emit_timestamp;
break;

26
src/intel/vulkan_hasvk/anv_private.h
View file

@ -4244,7 +4244,7 @@ VK_DEFINE_NONDISP_HANDLE_CASTS(anv_performance_configuration_intel, base,
VK_OBJECT_TYPE_PERFORMANCE_CONFIGURATION_INTEL)
#define anv_genX(devinfo, thing) ({ \
__typeof(&gfx9_##thing) genX_thing; \
__typeof(&gfx7_##thing) genX_thing; \
switch ((devinfo)->verx10) { \
case 70: \
genX_thing = &gfx7_##thing; \
@ -4255,18 +4255,6 @@ VK_DEFINE_NONDISP_HANDLE_CASTS(anv_performance_configuration_intel, base,
case 80: \
genX_thing = &gfx8_##thing; \
break; \
case 90: \
genX_thing = &gfx9_##thing; \
break; \
case 110: \
genX_thing = &gfx11_##thing; \
break; \
case 120: \
genX_thing = &gfx12_##thing; \
break; \
case 125: \
genX_thing = &gfx125_##thing; \
break; \
default: \
unreachable("Unknown hardware generation"); \
} \
@ -4286,18 +4274,6 @@ VK_DEFINE_NONDISP_HANDLE_CASTS(anv_performance_configuration_intel, base,
# define genX(x) gfx8_##x
# include "anv_genX.h"
# undef genX
# define genX(x) gfx9_##x
# include "anv_genX.h"
# undef genX
# define genX(x) gfx11_##x
# include "anv_genX.h"
# undef genX
# define genX(x) gfx12_##x
# include "anv_genX.h"
# undef genX
# define genX(x) gfx125_##x
# include "anv_genX.h"
# undef genX
#endif
#endif /* ANV_PRIVATE_H */

11
src/intel/vulkan_hasvk/meson.build
View file

@ -26,9 +26,7 @@ anv_hasvk_entrypoints = custom_target(
prog_python, '@INPUT0@', '--xml', '@INPUT1@', '--proto', '--weak',
'--out-h', '@OUTPUT0@', '--out-c', '@OUTPUT1@', '--prefix', 'anv',
'--device-prefix', 'gfx7', '--device-prefix', 'gfx75',
'--device-prefix', 'gfx8', '--device-prefix', 'gfx9',
'--device-prefix', 'gfx11', '--device-prefix', 'gfx12',
'--device-prefix', 'gfx125',
'--device-prefix', 'gfx8',
],
depend_files : vk_entrypoints_gen_depend_files,
)
@ -76,10 +74,9 @@ anv_per_hw_ver_files = files(
'genX_query.c',
'genX_state.c',
)
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']]]
foreach g : [['70', ['gfx7_cmd_buffer.c']],
['75', ['gfx7_cmd_buffer.c']],
['80', ['gfx8_cmd_buffer.c']]]
_gfx_ver = g[0]
libanv_per_hw_ver_libs += static_library(
'anv_per_hw_ver@0@'.format(_gfx_ver),