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>
This commit is contained in:
Adam Jackson
2024-06-13 19:25:17 -04:00
committed by Marge Bot
parent de41fda2f5
commit 91e1ea52c9
32 changed files with 34 additions and 41 deletions
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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" {
+1 -1
View File
@@ -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 {
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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"
+3 -3
View File
@@ -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,
)