After pulling u_math into src/util to fix 32 bit windows builds of nir, I broke the MacOS build. This series fixes that platform by pulling down cpu_info into src/util as well. I would have liked to replace some of the duplication that cpu_info has with core mesa bits, but this is really needed before the 18.3 branch point.
Dylan Baker (11): gallium: split u_prim_name out of u_debug.h gallium/util: start splitting u_debug into generic and gallium specific components gallium/util: move debug_print_usage_enum to the u_debug_gallium gallium/util: move debug_print_bind_flags to u_debug_gallium gallium/util: move debug_print_tranfer_flags to u_debug_galilum gallium/util: move memory debug declarations into u_debug_gallium gallium/util: remove p_format.h from u_debug.h gallium/util: remove u_inlines.h from u_debug.c util: Move os_misc to util util: Move u_debug to utils util: move u_cpu_detect to util src/gallium/auxiliary/Makefile.sources | 9 +- src/gallium/auxiliary/meson.build | 9 +- src/gallium/auxiliary/tgsi/tgsi_ureg.h | 1 + src/gallium/auxiliary/util/u_debug_gallium.c | 107 +++++++++++++++++ .../{os/os_misc.h => util/u_debug_gallium.h} | 79 ++++--------- src/gallium/auxiliary/util/u_debug_memory.c | 1 + src/gallium/auxiliary/util/u_debug_stack.c | 2 +- src/gallium/auxiliary/util/u_debug_symbol.c | 2 +- src/gallium/auxiliary/util/u_format_zs.c | 1 - src/gallium/auxiliary/util/u_log.h | 2 +- src/gallium/auxiliary/util/u_pack_color.h | 2 +- src/gallium/auxiliary/util/u_prim.c | 48 ++++++++ src/gallium/drivers/i915/i915_screen.c | 2 +- src/gallium/drivers/llvmpipe/lp_screen.c | 2 +- src/gallium/drivers/softpipe/sp_screen.c | 2 +- src/gallium/drivers/v3d/v3d_screen.c | 2 +- src/gallium/drivers/vc4/vc4_screen.c | 2 +- src/gallium/state_trackers/wgl/stw_device.c | 1 + src/util/Makefile.sources | 6 + src/util/meson.build | 6 + src/{gallium/auxiliary/os => util}/os_misc.c | 0 src/{gallium/auxiliary/os => util}/os_misc.h | 0 .../auxiliary => }/util/u_cpu_detect.c | 2 +- .../auxiliary => }/util/u_cpu_detect.h | 0 src/{gallium/auxiliary => }/util/u_debug.c | 108 ------------------ src/{gallium/auxiliary => }/util/u_debug.h | 25 +--- 26 files changed, 209 insertions(+), 212 deletions(-) create mode 100644 src/gallium/auxiliary/util/u_debug_gallium.c copy src/gallium/auxiliary/{os/os_misc.h => util/u_debug_gallium.h} (54%) create mode 100644 src/gallium/auxiliary/util/u_prim.c rename src/{gallium/auxiliary/os => util}/os_misc.c (100%) rename src/{gallium/auxiliary/os => util}/os_misc.h (100%) rename src/{gallium/auxiliary => }/util/u_cpu_detect.c (99%) rename src/{gallium/auxiliary => }/util/u_cpu_detect.h (100%) rename src/{gallium/auxiliary => }/util/u_debug.c (77%) rename src/{gallium/auxiliary => }/util/u_debug.h (95%) -- 2.19.1 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev