diff options
| author | Adam Jackson <ajax@redhat.com> | 2024-06-13 19:25:17 -0400 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2024-07-17 23:47:05 +0000 |
| commit | 91e1ea52c9dc3c8bac564d4dbaf196591beac3f5 (patch) | |
| tree | eb2f2ac3174a4765faded1401fc185f1e270e6c9 /src/mapi | |
| parent | de41fda2f58ce7028edaff9128512a1734fbce3b (diff) | |
mesa_interface: Move out of GL/internal/
Move it into src/gallium/include/ to make it absolutely clear this is a Mesa detail.
While we're at it, clean up its include sites, including some places
where we can just include kopper_interface.h instead since it includes
mesa_interface.h as its first act.
Acked-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28378>
Diffstat (limited to 'src/mapi')
| -rw-r--r-- | src/mapi/glapi/meson.build | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mapi/glapi/meson.build b/src/mapi/glapi/meson.build index e6b26a69eec..d6b209a82f3 100644 --- a/src/mapi/glapi/meson.build +++ b/src/mapi/glapi/meson.build @@ -63,7 +63,7 @@ endif libglapi_bridge = static_library( 'glapi_bridge', bridge_glapi_files, - include_directories : [inc_mesa, inc_include, inc_src, inc_mapi], + include_directories : [inc_mesa, inc_include, inc_src, inc_mapi, inc_gallium], c_args : [c_msvc_compat_args, bridge_glapi_args], dependencies : [dep_thread, dep_selinux, idep_mesautil], build_by_default : false, @@ -75,7 +75,7 @@ else libglapi_static = static_library( 'glapi_static', static_glapi_files, - include_directories : [inc_mesa, inc_include, inc_src, inc_mapi], + include_directories : [inc_mesa, inc_include, inc_src, inc_mapi, inc_gallium], c_args : [c_msvc_compat_args, static_glapi_args], dependencies : [dep_thread, dep_selinux, idep_mesautil], build_by_default : false, @@ -90,7 +90,7 @@ if with_any_opengl and not with_shared_glapi and with_tests and not with_platfor executable( 'glapi_static_check_table', ['tests/check_table.cpp', glapitable_h], - include_directories : [inc_include, inc_src, inc_mesa, inc_mapi], + include_directories : [inc_include, inc_src, inc_mesa, inc_mapi, inc_gallium], link_with : [libglapi_static], dependencies : [idep_gtest, dep_thread], ), |