gallium,util: Pull u_indices and u_primconvert back into gallium
authorJason Ekstrand <jason.ekstrand@collabora.com>
Mon, 16 Jan 2023 22:03:11 +0000 (16:03 -0600)
committerEric Engestrom <eric@engestrom.ch>
Thu, 26 Jan 2023 15:40:31 +0000 (15:40 +0000)
commit8da3b21d07ba4d4596657061bea8ecf7e174fc80
tree93640932ffd784d7eaf434a2024133636d1dd9fa
parentc465184d2685d91f85c4a6999ddd561f22512ccb
gallium,util: Pull u_indices and u_primconvert back into gallium

This was moved in !13741 but doing so created a link-time dependency
between util and gallium which causes problems for Vulkan drivers.
Meanwhile, having mesa/main depend on gallium is fine now that we don't
have any classic drivers.  It's a bit circular but should be harmless.

Fixes: 97ba2f2fd486 ("move util/indices to core util")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/8098
Acked-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20734>
(cherry picked from commit d292cb82b8ef1311eb4b78af2c90b1840ba5a6bf)
15 files changed:
.pick_status.json
src/gallium/auxiliary/indices/u_indices.c [moved from src/util/indices/u_indices.c with 100% similarity]
src/gallium/auxiliary/indices/u_indices.h [moved from src/util/indices/u_indices.h with 100% similarity]
src/gallium/auxiliary/indices/u_indices_gen.py [moved from src/util/indices/u_indices_gen.py with 100% similarity]
src/gallium/auxiliary/indices/u_indices_priv.h [moved from src/util/indices/u_indices_priv.h with 100% similarity]
src/gallium/auxiliary/indices/u_primconvert.c [moved from src/util/indices/u_primconvert.c with 100% similarity]
src/gallium/auxiliary/indices/u_primconvert.h [moved from src/util/indices/u_primconvert.h with 100% similarity]
src/gallium/auxiliary/indices/u_unfilled_gen.py [moved from src/util/indices/u_unfilled_gen.py with 100% similarity]
src/gallium/auxiliary/indices/u_unfilled_indices.c [moved from src/util/indices/u_unfilled_indices.c with 100% similarity]
src/gallium/auxiliary/meson.build
src/gallium/auxiliary/util/u_vbuf.c
src/gallium/drivers/svga/svga_draw_arrays.c
src/gallium/drivers/svga/svga_draw_elements.c
src/mesa/vbo/vbo_save_api.c
src/util/meson.build