Commit 848e7b94 authored by Kristian H. Kristensen's avatar Kristian H. Kristensen Committed by Marge Bot
Browse files

util: Move stack debug functions to src/util



Reviewed-by: Eric Engestrom's avatarEric Engestrom <eric@engestrom.ch>
Part-of: <!6112>
parent e487043f
......@@ -841,10 +841,8 @@ if with_platform_android
dependency('cutils'),
dependency('hardware'),
dependency('sync'),
dependency('backtrace')
]
if with_gallium
dep_android += dependency('backtrace')
endif
if get_option('platform-sdk-version') >= 26
dep_android += dependency('nativewindow')
endif
......
......@@ -249,9 +249,6 @@ files_libgallium = files(
'util/u_debug_image.h',
'util/u_debug_refcnt.c',
'util/u_debug_refcnt.h',
'util/u_debug_stack.h',
'util/u_debug_symbol.c',
'util/u_debug_symbol.h',
'util/u_dirty_flags.h',
'util/u_dirty_surfaces.h',
'util/u_dl.c',
......@@ -341,16 +338,6 @@ files_libgallium = files(
'nir/nir_draw_helpers.h',
)
if with_platform_android
files_libgallium += files(
'util/u_debug_stack_android.cpp',
)
else
files_libgallium += files(
'util/u_debug_stack.c',
)
endif
if dep_libdrm.found()
files_libgallium += files(
'renderonly/renderonly.c',
......@@ -522,7 +509,7 @@ libgallium = static_library(
cpp_args : [cpp_msvc_compat_args],
gnu_symbol_visibility : 'hidden',
dependencies : [
dep_libdrm, dep_llvm, dep_unwind, dep_dl, dep_m, dep_thread, dep_lmsensors,
dep_libdrm, dep_llvm, dep_dl, dep_m, dep_thread, dep_lmsensors,
idep_nir, idep_nir_headers, idep_mesautil,
],
build_by_default : false
......
......@@ -158,15 +158,24 @@ deps_for_libmesa_util = [
dep_m,
dep_valgrind,
dep_zstd,
dep_dl,
dep_unwind,
]
if with_platform_android
deps_for_libmesa_util += dep_android
files_debug_stack = files('u_debug_stack_android.cpp')
else
files_debug_stack = files(
'u_debug_stack.c',
'u_debug_symbol.c',
'u_debug_symbol.h',
)
endif
_libmesa_util = static_library(
'mesa_util',
[files_mesa_util, format_srgb],
[files_mesa_util, files_debug_stack, format_srgb],
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
dependencies : deps_for_libmesa_util,
link_with: libmesa_format,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment