From 6be17e222d59ce39e04c517e1d553c08c519834f Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Sun, 24 Mar 2024 08:55:07 -0400 Subject: [PATCH] treewide: Include mesa_interface.h not dri_interface.h We're about to split the latter off as a compatibility detail for older versions of Xorg, and the former includes the latter at this point, so this should be just to prove no functional change. Acked-by: Daniel Stone Part-of: --- include/kopper_interface.h | 2 +- src/egl/drivers/dri2/egl_dri2.c | 4 ++-- src/egl/drivers/dri2/egl_dri2.h | 2 +- src/egl/drivers/dri2/platform_android.h | 2 +- src/gallium/frontends/dri/dri_util.h | 2 +- src/gbm/backends/dri/gbm_dri.c | 4 ++-- src/gbm/backends/dri/gbm_driint.h | 4 ++-- src/glx/dri_common.h | 2 +- src/glx/dri_common_interop.c | 2 +- src/glx/dri_common_query_renderer.c | 2 +- src/glx/tests/query_renderer_implementation_unittest.cpp | 2 +- src/loader/loader.c | 1 - src/loader/loader.h | 2 +- src/loader/loader_dri3_helper.h | 2 +- src/loader/loader_dri_helper.c | 4 ++-- src/loader/loader_dri_helper.h | 4 ++-- src/mesa/state_tracker/st_cb_eglimage.c | 2 +- src/util/u_gralloc/u_gralloc.h | 2 +- 18 files changed, 22 insertions(+), 23 deletions(-) diff --git a/include/kopper_interface.h b/include/kopper_interface.h index b1162a95610..94824793ea3 100644 --- a/include/kopper_interface.h +++ b/include/kopper_interface.h @@ -34,7 +34,7 @@ #ifndef KOPPER_INTERFACE_H #define KOPPER_INTERFACE_H -#include +#include #include typedef struct __DRIkopperExtensionRec __DRIkopperExtension; diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index 050830af6a6..f56bcaae38a 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 -#include +#include #include #include #include "dri_screen.h" @@ -2711,7 +2711,7 @@ dri2_query_dma_buf_formats(_EGLDisplay *disp, EGLint max, EGLint *formats, if (max > 0) { /* Assert that all of the formats returned are actually fourcc formats. * Some day, if we want the internal interface function to be able to - * return the fake fourcc formats defined in dri_interface.h, we'll have + * return the fake fourcc formats defined in mesa_interface.h, we'll have * to do something more clever here to pair the list down to just real * fourcc formats so that we don't leak the fake internal ones. */ diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h index 93427fa80ce..7956228f37e 100644 --- a/src/egl/drivers/dri2/egl_dri2.h +++ b/src/egl/drivers/dri2/egl_dri2.h @@ -59,7 +59,7 @@ struct zwp_linux_dmabuf_feedback_v1; #endif #include -#include +#include #include #include "kopper_interface.h" diff --git a/src/egl/drivers/dri2/platform_android.h b/src/egl/drivers/dri2/platform_android.h index 674297a5447..298173167cf 100644 --- a/src/egl/drivers/dri2/platform_android.h +++ b/src/egl/drivers/dri2/platform_android.h @@ -29,7 +29,7 @@ #include #include -#include +#include #include "egl_dri2.h" diff --git a/src/gallium/frontends/dri/dri_util.h b/src/gallium/frontends/dri/dri_util.h index 869f075923f..93ffea76780 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 -#include +#include #include "kopper_interface.h" #include "main/formats.h" #include "main/glconfig.h" diff --git a/src/gbm/backends/dri/gbm_dri.c b/src/gbm/backends/dri/gbm_dri.c index 6cc2d5d8197..0eddaf836d9 100644 --- a/src/gbm/backends/dri/gbm_dri.c +++ b/src/gbm/backends/dri/gbm_dri.c @@ -41,8 +41,8 @@ #include #include "drm-uapi/drm_fourcc.h" -#include /* dri_interface needs GL types */ -#include +#include /* mesa_interface needs GL types */ +#include #include "gbm_driint.h" diff --git a/src/gbm/backends/dri/gbm_driint.h b/src/gbm/backends/dri/gbm_driint.h index 6600a82d1de..54bd666888c 100644 --- a/src/gbm/backends/dri/gbm_driint.h +++ b/src/gbm/backends/dri/gbm_driint.h @@ -34,8 +34,8 @@ #include "gbmint.h" #include "c11/threads.h" -#include /* dri_interface needs GL types */ -#include "GL/internal/dri_interface.h" +#include /* mesa_interface needs GL types */ +#include "GL/internal/mesa_interface.h" #include "GL/internal/mesa_interface.h" #include "kopper_interface.h" diff --git a/src/glx/dri_common.h b/src/glx/dri_common.h index 1aa6a84e789..e4fb2fe795f 100644 --- a/src/glx/dri_common.h +++ b/src/glx/dri_common.h @@ -38,7 +38,7 @@ #ifdef GLX_DIRECT_RENDERING -#include +#include #include #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 ab7596d7938..5f8c1a52e2a 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/dri_interface.h" +#include "GL/internal/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 0ca75a2b058..339e55c5735 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/dri_interface.h" +#include "GL/internal/mesa_interface.h" #include "dri2_priv.h" #if defined(HAVE_DRI3) #include "dri3_priv.h" diff --git a/src/glx/tests/query_renderer_implementation_unittest.cpp b/src/glx/tests/query_renderer_implementation_unittest.cpp index 0b5a57e0b2e..c2d282749e9 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/dri_interface.h" +#include "GL/internal/mesa_interface.h" #include "dri2_priv.h" namespace { diff --git a/src/loader/loader.c b/src/loader/loader.c index af41923b859..aaff61e8ff7 100644 --- a/src/loader/loader.c +++ b/src/loader/loader.c @@ -45,7 +45,6 @@ #include #endif #include -#include #include #include "loader.h" #include "util/libdrm.h" diff --git a/src/loader/loader.h b/src/loader/loader.h index eb71dc176c8..6c387b9b23f 100644 --- a/src/loader/loader.h +++ b/src/loader/loader.h @@ -30,7 +30,7 @@ #include #include #include -#include "GL/internal/dri_interface.h" +#include "GL/internal/mesa_interface.h" #ifdef __cplusplus extern "C" { diff --git a/src/loader/loader_dri3_helper.h b/src/loader/loader_dri3_helper.h index cc2362dd599..256caa8622a 100644 --- a/src/loader/loader_dri3_helper.h +++ b/src/loader/loader_dri3_helper.h @@ -32,7 +32,7 @@ #include #include -#include +#include #include enum loader_dri3_buffer_type { diff --git a/src/loader/loader_dri_helper.c b/src/loader/loader_dri_helper.c index f1afce47b92..5f0d48f7afb 100644 --- a/src/loader/loader_dri_helper.c +++ b/src/loader/loader_dri_helper.c @@ -23,8 +23,8 @@ #include #include -#include /* dri_interface needs GL types */ -#include +#include /* mesa_interface needs GL types */ +#include #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 0e077932e9c..0aee92dcfc5 100644 --- a/src/loader/loader_dri_helper.h +++ b/src/loader/loader_dri_helper.h @@ -24,8 +24,8 @@ #include #include -#include /* dri_interface needs GL types */ -#include +#include /* mesa_interface needs GL types */ +#include #include #include "util/format/u_formats.h" diff --git a/src/mesa/state_tracker/st_cb_eglimage.c b/src/mesa/state_tracker/st_cb_eglimage.c index bd375bda578..d6a894104d9 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 */ -#include +#include #include "main/errors.h" #include "main/texobj.h" #include "main/teximage.h" diff --git a/src/util/u_gralloc/u_gralloc.h b/src/util/u_gralloc/u_gralloc.h index a04a490d636..1dee15144c1 100644 --- a/src/util/u_gralloc/u_gralloc.h +++ b/src/util/u_gralloc/u_gralloc.h @@ -17,7 +17,7 @@ extern "C" { #include #include "util/macros.h" -#include "GL/internal/dri_interface.h" +#include "GL/internal/mesa_interface.h" struct u_gralloc;