move util/indices to core util

these are useful tools to have outside of gallium

Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>

Reviewed-by: Adam Jackson <ajax@redhat.com>
Acked-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13741>
This commit is contained in:
Mike Blumenkrantz 2021-11-10 09:57:48 -05:00 committed by Marge Bot
parent 88e4d3809c
commit 97ba2f2fd4
10 changed files with 22 additions and 22 deletions

View file

@ -120,10 +120,6 @@ files_libgallium = files(
'hud/hud_driver_query.c', 'hud/hud_driver_query.c',
'hud/hud_fps.c', 'hud/hud_fps.c',
'hud/hud_private.h', 'hud/hud_private.h',
'indices/u_indices.h',
'indices/u_indices_priv.h',
'indices/u_primconvert.c',
'indices/u_primconvert.h',
'os/os_mman.h', 'os/os_mman.h',
'os/os_process.c', 'os/os_process.c',
'os/os_process.h', 'os/os_process.h',
@ -506,29 +502,13 @@ idep_u_tracepoints = declare_dependency(
sources: files_u_tracepoints, sources: files_u_tracepoints,
) )
u_indices_gen_c = custom_target(
'u_indices_gen.c',
input : 'indices/u_indices_gen.py',
output : 'u_indices_gen.c',
command : [prog_python, '@INPUT@'],
capture : true,
)
u_unfilled_gen_c = custom_target(
'u_unfilled_gen.c',
input : 'indices/u_unfilled_gen.py',
output : 'u_unfilled_gen.c',
command : [prog_python, '@INPUT@'],
capture : true,
)
libgallium_extra_c_args = [] libgallium_extra_c_args = []
if with_swrast_vk and with_gallium_zink if with_swrast_vk and with_gallium_zink
libgallium_extra_c_args += '-DZINK_WITH_SWRAST_VK' libgallium_extra_c_args += '-DZINK_WITH_SWRAST_VK'
endif endif
libgallium = static_library( libgallium = static_library(
'gallium', 'gallium',
[files_libgallium, u_indices_gen_c, u_unfilled_gen_c], [files_libgallium],
include_directories : [ include_directories : [
inc_loader, inc_gallium, inc_src, inc_include, include_directories('util') inc_loader, inc_gallium, inc_src, inc_include, include_directories('util')
], ],

View file

@ -150,6 +150,10 @@ files_mesa_util = files(
'vma.c', 'vma.c',
'vma.h', 'vma.h',
'xxhash.h', 'xxhash.h',
'indices/u_indices.h',
'indices/u_indices_priv.h',
'indices/u_primconvert.c',
'indices/u_primconvert.h',
) )
files_drirc = files('00-mesa-defaults.conf') files_drirc = files('00-mesa-defaults.conf')
@ -227,9 +231,25 @@ endif
u_trace_py = files('perf/u_trace.py') u_trace_py = files('perf/u_trace.py')
u_indices_gen_c = custom_target(
'u_indices_gen.c',
input : 'indices/u_indices_gen.py',
output : 'u_indices_gen.c',
command : [prog_python, '@INPUT@'],
capture : true,
)
u_unfilled_gen_c = custom_target(
'u_unfilled_gen.c',
input : 'indices/u_unfilled_gen.py',
output : 'u_unfilled_gen.c',
command : [prog_python, '@INPUT@'],
capture : true,
)
_libmesa_util = static_library( _libmesa_util = static_library(
'mesa_util', 'mesa_util',
[files_mesa_util, files_debug_stack, format_srgb], [files_mesa_util, files_debug_stack, format_srgb, u_indices_gen_c, u_unfilled_gen_c],
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
dependencies : deps_for_libmesa_util, dependencies : deps_for_libmesa_util,
link_with: libmesa_format, link_with: libmesa_format,