On 08/08/18 00:14, Bas Nieuwenhuizen wrote:
radv was always just mirroring a derived version of the anv
version, sometimes hacked together and sometimes very behind.
As we grow more vulkan drivers this repetition makes even less
sense, so lets merge them. I took the anv generators as the
template and made radv use them.
This includes some messy stuff in the build system due to
difficulties with python includes. I tested with meson and
autotools. Android.mk is updated but not tested.
We have an android build target in our CI. I can give this series a go.
-
Lionel
Bas Nieuwenhuizen (4):
vulkan: Add central copy of entrypoints/extensions code.
vulkan/util: Add support to not generate the trampolines.
anv: Use central api generation scripts.
radv: Integrate with common generators.
src/amd/vulkan/Android.mk | 16 +-
src/amd/vulkan/Makefile.am | 29 +-
src/amd/vulkan/meson.build | 91 ++--
src/amd/vulkan/radv_device.c | 56 ++-
src/amd/vulkan/radv_entrypoints_gen.py | 462 +-------------------
src/amd/vulkan/radv_extensions.py | 236 +----------
src/amd/vulkan/radv_extensions_gen.py | 44 ++
src/amd/vulkan/radv_icd.py | 1 +
src/amd/vulkan/radv_private.h | 9 +-
src/amd/vulkan/radv_wsi.c | 6 +-
src/intel/Android.vulkan.mk | 9 +
src/intel/Makefile.vulkan.am | 25 +-
src/intel/vulkan/anv_device.c | 46 ++
src/intel/vulkan/anv_entrypoints_gen.py | 537 +-----------------------
src/intel/vulkan/anv_extensions.py | 68 +--
src/intel/vulkan/anv_extensions_gen.py | 177 +-------
src/intel/vulkan/meson.build | 15 +-
src/vulkan/Makefile.am | 3 +
src/vulkan/util/meson.build | 2 +
src/vulkan/util/vk_entrypoints_gen.py | 522 +++++++++++++++++++++++
src/vulkan/util/vk_extensions.py | 93 ++++
src/vulkan/util/vk_extensions_gen.py | 205 +++++++++
22 files changed, 1131 insertions(+), 1521 deletions(-)
create mode 100644 src/amd/vulkan/radv_extensions_gen.py
create mode 100644 src/vulkan/util/vk_entrypoints_gen.py
create mode 100644 src/vulkan/util/vk_extensions.py
create mode 100644 src/vulkan/util/vk_extensions_gen.py
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
