diff options
32 files changed, 34 insertions, 41 deletions
diff --git a/include/kopper_interface.h b/include/kopper_interface.h index 94824793ea3..5ab5be68f7e 100644 --- a/include/kopper_interface.h +++ b/include/kopper_interface.h @@ -34,7 +34,7 @@ #ifndef KOPPER_INTERFACE_H #define KOPPER_INTERFACE_H -#include <GL/internal/mesa_interface.h> +#include "mesa_interface.h" #include <vulkan/vulkan_core.h> typedef struct __DRIkopperExtensionRec __DRIkopperExtension; diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index f56bcaae38a..085c1d4b4b7 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -42,7 +42,7 @@ #include "drm-uapi/drm_fourcc.h" #endif #include <GL/gl.h> -#include <GL/internal/mesa_interface.h> +#include "mesa_interface.h" #include <sys/stat.h> #include <sys/types.h> #include "dri_screen.h" diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h index 7956228f37e..04cba570eee 100644 --- a/src/egl/drivers/dri2/egl_dri2.h +++ b/src/egl/drivers/dri2/egl_dri2.h @@ -59,8 +59,7 @@ struct zwp_linux_dmabuf_feedback_v1; #endif #include <GL/gl.h> -#include <GL/internal/mesa_interface.h> -#include <GL/internal/mesa_interface.h> +#include "mesa_interface.h" #include "kopper_interface.h" #ifdef HAVE_DRM_PLATFORM diff --git a/src/egl/drivers/dri2/platform_android.h b/src/egl/drivers/dri2/platform_android.h index 298173167cf..ea1c193b371 100644 --- a/src/egl/drivers/dri2/platform_android.h +++ b/src/egl/drivers/dri2/platform_android.h @@ -29,8 +29,7 @@ #include <stdbool.h> #include <stdint.h> -#include <GL/internal/mesa_interface.h> - +#include "mesa_interface.h" #include "egl_dri2.h" #if ANDROID_API_LEVEL < 26 diff --git a/src/gallium/frontends/dri/dri2.c b/src/gallium/frontends/dri/dri2.c index 924922eb419..e4c34dcd841 100644 --- a/src/gallium/frontends/dri/dri2.c +++ b/src/gallium/frontends/dri/dri2.c @@ -31,7 +31,7 @@ #include "util/libdrm.h" #include "git_sha1.h" #include "GL/mesa_glinterop.h" -#include "GL/internal/mesa_interface.h" +#include "mesa_interface.h" #include "util/disk_cache.h" #include "util/u_memory.h" #include "util/u_inlines.h" diff --git a/src/gallium/frontends/dri/dri_util.c b/src/gallium/frontends/dri/dri_util.c index 354b102e152..55301b2e2c7 100644 --- a/src/gallium/frontends/dri/dri_util.c +++ b/src/gallium/frontends/dri/dri_util.c @@ -52,7 +52,7 @@ #include "main/debug_output.h" #include "main/errors.h" #include "loader/loader.h" -#include "GL/internal/mesa_interface.h" +#include "mesa_interface.h" #include "loader_dri_helper.h" driOptionDescription __dri2ConfigOptions[] = { diff --git a/src/gallium/frontends/dri/dri_util.h b/src/gallium/frontends/dri/dri_util.h index 93ffea76780..648df773c27 100644 --- a/src/gallium/frontends/dri/dri_util.h +++ b/src/gallium/frontends/dri/dri_util.h @@ -35,7 +35,7 @@ #define _DRI_UTIL_H_ #include <GL/gl.h> -#include <GL/internal/mesa_interface.h> +#include "mesa_interface.h" #include "kopper_interface.h" #include "main/formats.h" #include "main/glconfig.h" diff --git a/src/gallium/frontends/dri/drisw.c b/src/gallium/frontends/dri/drisw.c index f7573c60f4a..8ccc6709b4f 100644 --- a/src/gallium/frontends/dri/drisw.c +++ b/src/gallium/frontends/dri/drisw.c @@ -26,7 +26,7 @@ * **************************************************************************/ -#include "GL/internal/mesa_interface.h" +#include "mesa_interface.h" #include "git_sha1.h" #include "util/format/u_format.h" #include "util/u_memory.h" diff --git a/src/gallium/frontends/dri/kopper.c b/src/gallium/frontends/dri/kopper.c index 7c3cba81e9c..e7a6bc7caa0 100644 --- a/src/gallium/frontends/dri/kopper.c +++ b/src/gallium/frontends/dri/kopper.c @@ -21,7 +21,7 @@ * DEALINGS IN THE SOFTWARE. */ -#include "GL/internal/mesa_interface.h" +#include "mesa_interface.h" #include "git_sha1.h" #include "util/format/u_format.h" #include "util/u_memory.h" diff --git a/include/GL/internal/mesa_interface.h b/src/gallium/include/mesa_interface.h index 7fc7ca4670f..7fc7ca4670f 100644 --- a/include/GL/internal/mesa_interface.h +++ b/src/gallium/include/mesa_interface.h diff --git a/src/gbm/backends/dri/gbm_dri.c b/src/gbm/backends/dri/gbm_dri.c index 0eddaf836d9..8db9c400d81 100644 --- a/src/gbm/backends/dri/gbm_dri.c +++ b/src/gbm/backends/dri/gbm_dri.c @@ -34,18 +34,15 @@ #include <errno.h> #include <limits.h> #include <assert.h> - #include <sys/types.h> #include <unistd.h> #include <dlfcn.h> #include <xf86drm.h> #include "drm-uapi/drm_fourcc.h" - #include <GL/gl.h> /* mesa_interface needs GL types */ -#include <GL/internal/mesa_interface.h> +#include "mesa_interface.h" #include "gbm_driint.h" - #include "gbmint.h" #include "loader_dri_helper.h" #include "kopper_interface.h" diff --git a/src/gbm/backends/dri/gbm_driint.h b/src/gbm/backends/dri/gbm_driint.h index 54bd666888c..a456900ae4b 100644 --- a/src/gbm/backends/dri/gbm_driint.h +++ b/src/gbm/backends/dri/gbm_driint.h @@ -35,8 +35,7 @@ #include "c11/threads.h" #include <GL/gl.h> /* mesa_interface needs GL types */ -#include "GL/internal/mesa_interface.h" -#include "GL/internal/mesa_interface.h" +#include "mesa_interface.h" #include "kopper_interface.h" struct gbm_dri_surface; diff --git a/src/gbm/meson.build b/src/gbm/meson.build index b7586fcc8fb..e0704792e17 100644 --- a/src/gbm/meson.build +++ b/src/gbm/meson.build @@ -16,7 +16,7 @@ args_gbm = [ ] deps_gbm = [] incs_gbm = [ - include_directories('main'), inc_include, inc_src, inc_loader, + include_directories('main'), inc_include, inc_src, inc_loader, inc_gallium ] if with_dri2 diff --git a/src/glx/dri2_priv.h b/src/glx/dri2_priv.h index 4adf7c0f94b..c4c5f3b9459 100644 --- a/src/glx/dri2_priv.h +++ b/src/glx/dri2_priv.h @@ -37,7 +37,7 @@ extern "C" { #endif -#include "GL/internal/mesa_interface.h" +#include "mesa_interface.h" struct dri2_screen { struct glx_screen base; diff --git a/src/glx/dri3_priv.h b/src/glx/dri3_priv.h index 0a9c0a648f8..047369fabe0 100644 --- a/src/glx/dri3_priv.h +++ b/src/glx/dri3_priv.h @@ -60,7 +60,7 @@ #include <xcb/sync.h> #include "loader_dri3_helper.h" -#include "GL/internal/mesa_interface.h" +#include "mesa_interface.h" struct dri3_display { diff --git a/src/glx/dri_common.h b/src/glx/dri_common.h index e4fb2fe795f..a2a0ec1c3cc 100644 --- a/src/glx/dri_common.h +++ b/src/glx/dri_common.h @@ -38,7 +38,7 @@ #ifdef GLX_DIRECT_RENDERING -#include <GL/internal/mesa_interface.h> +#include "mesa_interface.h" #include <stdbool.h> #include "loader.h" #include "util/macros.h" /* for PRINTFLIKE */ diff --git a/src/glx/dri_common_interop.c b/src/glx/dri_common_interop.c index 5f8c1a52e2a..7ec0452772a 100644 --- a/src/glx/dri_common_interop.c +++ b/src/glx/dri_common_interop.c @@ -25,7 +25,7 @@ #include "glxclient.h" #include "glx_error.h" -#include "GL/internal/mesa_interface.h" +#include "mesa_interface.h" #include "dri2_priv.h" #if defined(HAVE_DRI3) #include "dri3_priv.h" diff --git a/src/glx/dri_common_query_renderer.c b/src/glx/dri_common_query_renderer.c index 339e55c5735..6d37ce3d4c8 100644 --- a/src/glx/dri_common_query_renderer.c +++ b/src/glx/dri_common_query_renderer.c @@ -25,7 +25,7 @@ #include "glxclient.h" #include "glx_error.h" -#include "GL/internal/mesa_interface.h" +#include "mesa_interface.h" #include "dri2_priv.h" #if defined(HAVE_DRI3) #include "dri3_priv.h" diff --git a/src/glx/drisw_priv.h b/src/glx/drisw_priv.h index c7687ebcb63..f5a045da5f8 100644 --- a/src/glx/drisw_priv.h +++ b/src/glx/drisw_priv.h @@ -28,7 +28,6 @@ #include <X11/extensions/XShm.h> #include "kopper_interface.h" -#include "GL/internal/mesa_interface.h" struct drisw_display { diff --git a/src/glx/meson.build b/src/glx/meson.build index b5eb61a48fc..fda4b4b691c 100644 --- a/src/glx/meson.build +++ b/src/glx/meson.build @@ -108,7 +108,7 @@ endif libglx = static_library( 'glx', [files_libglx, glx_generated], - include_directories : [inc_include, inc_src, inc_glapi, inc_loader], + include_directories : [inc_include, inc_src, inc_glapi, inc_loader, inc_gallium], c_args : [ '-DGL_LIB_NAME="lib@0@.so.@1@"'.format(gl_lib_name, gl_lib_version.split('.')[0]), ], diff --git a/src/glx/tests/meson.build b/src/glx/tests/meson.build index f9e4600196c..947d76a5a71 100644 --- a/src/glx/tests/meson.build +++ b/src/glx/tests/meson.build @@ -28,7 +28,7 @@ if with_shared_glapi [files_glx_test, glx_indirect_size_h, main_dispatch_h], link_with : [libglx, libglapi, libloader], include_directories : [ - inc_src, inc_include, inc_mesa, inc_mapi, inc_glx, inc_loader, + inc_src, inc_include, inc_mesa, inc_mapi, inc_glx, inc_loader, inc_gallium ], dependencies : [dep_libdrm, dep_glproto, dep_thread, idep_gtest] ), diff --git a/src/glx/tests/query_renderer_implementation_unittest.cpp b/src/glx/tests/query_renderer_implementation_unittest.cpp index c2d282749e9..776c6ab91bf 100644 --- a/src/glx/tests/query_renderer_implementation_unittest.cpp +++ b/src/glx/tests/query_renderer_implementation_unittest.cpp @@ -29,7 +29,7 @@ #include "glxclient.h" #include "glx_error.h" #include "dri2.h" -#include "GL/internal/mesa_interface.h" +#include "mesa_interface.h" #include "dri2_priv.h" namespace { diff --git a/src/loader/loader.c b/src/loader/loader.c index aaff61e8ff7..f4799654dea 100644 --- a/src/loader/loader.c +++ b/src/loader/loader.c @@ -45,7 +45,7 @@ #include <sys/sysmacros.h> #endif #include <GL/gl.h> -#include <GL/internal/mesa_interface.h> +#include "mesa_interface.h" #include "loader.h" #include "util/libdrm.h" #include "util/os_file.h" diff --git a/src/loader/loader.h b/src/loader/loader.h index 6c387b9b23f..2e0797f3a5e 100644 --- a/src/loader/loader.h +++ b/src/loader/loader.h @@ -30,7 +30,7 @@ #include <stdbool.h> #include <sys/stat.h> #include <stddef.h> -#include "GL/internal/mesa_interface.h" +#include "mesa_interface.h" #ifdef __cplusplus extern "C" { diff --git a/src/loader/loader_dri3_helper.h b/src/loader/loader_dri3_helper.h index 256caa8622a..f23cf1fbb82 100644 --- a/src/loader/loader_dri3_helper.h +++ b/src/loader/loader_dri3_helper.h @@ -32,7 +32,7 @@ #include <xcb/present.h> #include <GL/gl.h> -#include <GL/internal/mesa_interface.h> +#include "mesa_interface.h" #include <c11/threads.h> enum loader_dri3_buffer_type { diff --git a/src/loader/loader_dri_helper.c b/src/loader/loader_dri_helper.c index 5f0d48f7afb..ae64547f8a6 100644 --- a/src/loader/loader_dri_helper.c +++ b/src/loader/loader_dri_helper.c @@ -24,7 +24,7 @@ #include <sys/types.h> #include <GL/gl.h> /* mesa_interface needs GL types */ -#include <GL/internal/mesa_interface.h> +#include "mesa_interface.h" #include "drm-uapi/drm_fourcc.h" #include "loader_dri_helper.h" diff --git a/src/loader/loader_dri_helper.h b/src/loader/loader_dri_helper.h index 0aee92dcfc5..b5c4fd19f90 100644 --- a/src/loader/loader_dri_helper.h +++ b/src/loader/loader_dri_helper.h @@ -25,7 +25,7 @@ #include <sys/types.h> #include <GL/gl.h> /* mesa_interface needs GL types */ -#include <GL/internal/mesa_interface.h> +#include "mesa_interface.h" #include <c11/threads.h> #include "util/format/u_formats.h" diff --git a/src/loader/meson.build b/src/loader/meson.build index 6fa6a6ce4ad..033935c7761 100644 --- a/src/loader/meson.build +++ b/src/loader/meson.build @@ -8,7 +8,7 @@ if with_platform_x11 and with_dri3 'loader_dri3_helper', 'loader_dri3_helper.c', gnu_symbol_visibility : 'hidden', - include_directories : [inc_include, inc_src], + include_directories : [inc_include, inc_src, inc_gallium], dependencies : [ idep_mesautil, dep_libdrm, dep_xcb_dri3, dep_xcb_present, dep_xcb_sync, dep_xshmfence, @@ -25,7 +25,7 @@ if with_platform_wayland 'loader_wayland_helper', 'loader_wayland_helper.c', gnu_symbol_visibility : 'hidden', - include_directories : [inc_include, inc_src], + include_directories : [inc_include, inc_src, inc_gallium], dependencies : [ dep_wayland_client, ], @@ -44,7 +44,7 @@ libloader = static_library( ['loader_dri_helper.c', 'loader.c', sha1_h], c_args : loader_c_args, gnu_symbol_visibility : 'hidden', - include_directories : [inc_include, inc_src, inc_util], + include_directories : [inc_include, inc_src, inc_util, inc_gallium], dependencies : [dep_libdrm, dep_thread, dep_xcb, dep_xcb_xrandr], build_by_default : false, ) 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], ), diff --git a/src/mesa/state_tracker/st_cb_eglimage.c b/src/mesa/state_tracker/st_cb_eglimage.c index d6a894104d9..62844ac9a41 100644 --- a/src/mesa/state_tracker/st_cb_eglimage.c +++ b/src/mesa/state_tracker/st_cb_eglimage.c @@ -25,7 +25,7 @@ * Chia-I Wu <olv@lunarg.com> */ -#include <GL/internal/mesa_interface.h> +#include "mesa_interface.h" #include "main/errors.h" #include "main/texobj.h" #include "main/teximage.h" diff --git a/src/util/u_gralloc/meson.build b/src/util/u_gralloc/meson.build index c834ee38c3d..7f7da1c1773 100644 --- a/src/util/u_gralloc/meson.build +++ b/src/util/u_gralloc/meson.build @@ -30,7 +30,7 @@ endif _libmesa_u_gralloc = static_library( '_mesa_u_gralloc', [files_u_gralloc], - include_directories : [inc_include, inc_util], + include_directories : [inc_gallium, inc_include, inc_util], c_args : c_args_for_u_gralloc, cpp_args : cpp_args_for_u_gralloc, override_options : options_for_u_gralloc, diff --git a/src/util/u_gralloc/u_gralloc.h b/src/util/u_gralloc/u_gralloc.h index 1dee15144c1..86e1209480b 100644 --- a/src/util/u_gralloc/u_gralloc.h +++ b/src/util/u_gralloc/u_gralloc.h @@ -17,7 +17,7 @@ extern "C" { #include <stdbool.h> #include "util/macros.h" -#include "GL/internal/mesa_interface.h" +#include "mesa_interface.h" struct u_gralloc; |